]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mips/mips-for-linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 23:59:15 +0000 (10:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 23:59:15 +0000 (10:59 +1100)
commite02a42e8b7d109286b723828e17f5af4a4a7cc88
treec8f6609b291d1eb704c20155299fca887ef30f58
parent35ddf95f4dd1ce2bf8fdcd3e9bc2af25c35b7a88
parent1fc140c2367e941a314a309ee5702ff144bdf64a
Merge remote-tracking branch 'mips/mips-for-linux-next'

Conflicts:
arch/mips/kernel/perf_event_mipsxx.c
arch/mips/kernel/perf_event_mipsxx.c
drivers/spi/Kconfig
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile