summaryrefslogtreecommitdiffstats
path: root/drivers/cdrom/gdrom.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-03-20 17:50:21 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2008-03-20 17:50:21 +0100
commit00c04db982b66fe9e8c8c5156808b905199bd645 (patch)
treed394c01dceffe37a6f67cccfc2e87a64aad7740a /drivers/cdrom/gdrom.c
parentMerge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff)
parentMerge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmli... (diff)
downloadlinux-00c04db982b66fe9e8c8c5156808b905199bd645.tar.xz
linux-00c04db982b66fe9e8c8c5156808b905199bd645.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4872/1: Replaces buggy macro in S3C2410 irq include [ARM] 4870/1: fix signal return code when enable CONFIG_OABI_COMPAT [ARM] 4869/1: ARM: OMAP: Fix compile for mcbsp [ARM] 4865/1: Register the F75375 device in the GLAN Tank platform code [ARM] 4864/1: Enable write buffer coalescing on IOP [ARM] 4863/1: AT91: CAP9 USART definitions for early debug [ARM] 4861/1: AT91: Update maintainer email address (again) ARM: OMAP1: Fix typo in OMAP1 MPU clock source initialization ARM: OMAP: Fix DMA CLINK mask, clear spurious interrupt ARM: OMAP: Fix chain_a_transfer return value ARM: OMAP: Fix missing makefile options ARM: OMAP: Fix GPIO IRQ unmask ARM: OMAP: Fix clockevent support for hrtimers
Diffstat (limited to 'drivers/cdrom/gdrom.c')
0 files changed, 0 insertions, 0 deletions