]> 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>
Tue, 20 Dec 2011 23:47:43 +0000 (10:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 23:47:43 +0000 (10:47 +1100)
commit4b4bb7d2ae6373f2f37547f66cbdd1d3f3120bc8
tree3f58547c36b129075bbfc40428f2faaad8ceac77
parentdad8e316987e627f2f7b51f3c99cd0ab79e1c600
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