]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mips/mips-for-linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:33:18 +0000 (11:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:33:18 +0000 (11:33 +1100)
commitb3fa7a62ecd9888c954e5692460627109ecd982e
tree298598bd966c177d2965f5fce116b44dd854bd4b
parent04433fc471aebbd08e6498c7f9904d350ae6c44b
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