]> 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, 13 Dec 2011 01:12:03 +0000 (12:12 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 01:12:03 +0000 (12:12 +1100)
commitc38d4896c4b453b8a94c2e3b40aacff2d121d5c5
tree830eaf873eac2282032e619c996b4b78ec71ebfd
parentde57a6ffc412f10ea0953529bba23369eff88b79
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