]> 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>
Mon, 12 Dec 2011 00:06:44 +0000 (11:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:06:44 +0000 (11:06 +1100)
commit644e4d5af72191314abfa6686a4d9d4a949d3941
treeee0f35435838eb5a04b549cf15b8e19df09cfdd3
parentb01d17c3e3a97dfc6c0797791bae50969b8a3431
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