aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/cdrom.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 10:40:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 10:40:00 -0800
commitd20056032e20061db6583f517a4d3ea4492a94f1 (patch)
tree2cedbf4c8a427a987bdd6799eecfc441816bf9d0 /include/linux/cdrom.h
parentMerge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 (diff)
parentARM: mach-shmobile: Kill off unused !gpio_is_valid() case (diff)
downloadlinux-dev-d20056032e20061db6583f517a4d3ea4492a94f1.tar.xz
linux-dev-d20056032e20061db6583f517a4d3ea4492a94f1.zip
Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: ARM: mach-shmobile: Kill off unused !gpio_is_valid() case ARM: mach-shmobile: sh7372 Enable SDIO IRQs for Mackerel ARM: mach-shmobile: sh7377 Enable SDIO IRQs ARM: mach-shmobile: sh7367 Enable SDIO IRQs ARM: mach-shmobile: sh7372 Enable SDIO IRQs ARM: mach-shmobile: mackerel: Add touchscreen ST1232 support ARM: mach-shmobile: ap4eb: SCIF port for earlyprintk when using zboot ARM: mach-shmobile: mackerel: SCIF port for earlyprintk when using zboot ARM: mach-shmobile: mackerel: Add support get_cd in CN23
Diffstat (limited to 'include/linux/cdrom.h')
0 files changed, 0 insertions, 0 deletions