| commit | 3b470ac43fcd9848fa65e58e54875ad75be61cec | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 31 09:31:37 2008 +1100 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 31 09:31:37 2008 +1100 |
| tree | eb067e163380d8a9e77a6df44f69dd4b935dd060 | |
| parent | 2c57ee6f924c95e4dce61ed4776fb3f62e1b9f92 [diff] | |
| parent | c847c853a5c562bac940c544748525d038167275 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: PPC: Fix powerpc vio_find_name to not use devices_subsys Driver core: add bus_find_device_by_name function Module: check to see if we have a built in module with the same name x86: fix runtime error in arch/x86/kernel/cpu/mcheck/mce_amd_64.c Driver core: Fix up build when CONFIG_BLOCK=N