]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'modem-shm/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:53:56 +0000 (14:53 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 Apr 2012 04:53:56 +0000 (14:53 +1000)
commit577124d758bb144b9be5415c67ce1c1701376205
tree9940e98d66075b0031efba09dcfbf76c10619a4a
parenta57661c3f3711b00a2e0168ff8787f6718addf6a
parent3cff1cc0d7703b289fc2e1dbf6cc7790ccac9d5e
Merge remote-tracking branch 'modem-shm/for-next'

Conflicts:
drivers/Kconfig
drivers/Kconfig
drivers/Makefile
include/linux/Kbuild