summaryrefslogtreecommitdiffstats
path: root/arch/um/Makefile-i386
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-28 20:03:14 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-28 20:03:14 +0100
commit2a397e82c7db18019e408f953dd58dc1963a328c (patch)
tree43ccaec68cc3aa1b3903e2b4c970d31b8737d4ed /arch/um/Makefile-i386
parentduplicate initializer in sound/pci/hda/patch_realtek.c (diff)
parentide: add SH-S202J to ivb_list[] (diff)
downloadlinux-2a397e82c7db18019e408f953dd58dc1963a328c.tar.xz
linux-2a397e82c7db18019e408f953dd58dc1963a328c.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: add SH-S202J to ivb_list[] drivers/ide/pci/sc1200.c: fix suspend/resume buglets and warnings drivers/ide/pci/generic: fix build for CONFIG_HOTPLUG=n hpt366: fix build for CONFIG_HOTPLUG=n cy82c693: fix build for CONFIG_HOTPLUG=n
Diffstat (limited to 'arch/um/Makefile-i386')
0 files changed, 0 insertions, 0 deletions