]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 02:29:49 +0000 (13:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 02:29:49 +0000 (13:29 +1100)
commitf5c8964a1206211969b76c8b93a903508f8b0659
treea9f5e1c429c998102436c8cfd3b6f9a423a27010
parent696da61c082f1b7c54edd725e33207d509dc4dee
parentde353533753e048b5c4658f0a42365937527ac45
Merge remote-tracking branch 'security/next'

Conflicts:
lib/Makefile
lib/Kconfig
lib/Makefile