tree 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059
parent e12f0102ac81d660c9f801d0a0e10ccf4537a9de
parent 6a94cb73064c952255336cc57731904174b2c58f
author Rusty Russell <rusty@rustcorp.com.au> 1230726957 +1030
committer Rusty Russell <rusty@rustcorp.com.au> 1230726957 +1030

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	arch/x86/kernel/io_apic.c