summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-16 08:11:23 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-16 08:11:23 -0700
commit0950efd1a1490e869d19ec631eed75ef57772f8b (patch)
treeee1138885190a3c7f6a0631c118ebb4ecbd3cb7a /init
parent4406c56d0a4da7a37b9180abeaece6cd00bcc874 (diff)
parent889c27744c30eb7a43b68c11e33e679cfafc8cd5 (diff)
downloadblackbird-op-linux-0950efd1a1490e869d19ec631eed75ef57772f8b.tar.gz
blackbird-op-linux-0950efd1a1490e869d19ec631eed75ef57772f8b.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6: pcmcia: document return value of pcmcia_loop_config pcmcia: dtl1_cs: fix pcmcia_loop_config logic pcmcia: drop non-existant includes pcmcia: disable prefetch/burst for OZ6933 pcmcia: fix incorrect argument order to list_add_tail() pcmcia: drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons pcmcia: Use phys_addr_t for physical addresses pcmcia: drivers/pcmcia: Make static
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud