summaryrefslogtreecommitdiffstats
path: root/include/asm-m68k
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-02 21:34:33 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-02 21:34:33 +0200
commit8eb224cd45239714c2be104f17d5ca16b6b5d7ac (patch)
treece422db6d98c43d38e2cd552095ef67c9f601492 /include/asm-m68k
parentsky2: fix suspend/resume races (diff)
parentide: use ->ata_input_data in ide_driveid_update() (diff)
downloadlinux-8eb224cd45239714c2be104f17d5ca16b6b5d7ac.tar.xz
linux-8eb224cd45239714c2be104f17d5ca16b6b5d7ac.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: ide: use ->ata_input_data in ide_driveid_update() ide-h8300: 32-bit I/O is unsupported ide/legacy/q40ide.c: add MODULE_LICENSE ide/legacy/macide: add MODULE_LICENSE ide/legacy/falconide.c: add MODULE_LICENSE ide/legacy/buddha.c: add MODULE_LICENSE ide/legacy/gayle.c: add MODULE_LICENSE ide/h8300/ide-h8300.c: add MODULE_LICENSE ide/cris/ide-cris.c: add MODULE_LICENSE ide/arm/ide_arm.c: add MODULE_LICENSE ide/ppc/pmac.c: add MODULE_LICENSE ide/ppc/mpc8xx.c: add MODULE_LICENSE ide/pci/cmd640.c: add MODULE_LICENSE ide-pnp.c: add MODULE_LICENSE
Diffstat (limited to 'include/asm-m68k')
0 files changed, 0 insertions, 0 deletions