]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 03:01:03 +0000 (14:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 03:01:03 +0000 (14:01 +1100)
commit967cbe7aaf5b169b518fc159d3e28ccd3e410d0b
tree5854c5db982c916b462c53dc2831863320ba28bf
parentd9b745de20d8a030686fe63fa31cdfddf374d457
parent735e93c70434614bffac4a914ca1da72e37d43c0
Merge remote-tracking branch 'security/next'

Conflicts:
lib/Makefile
lib/Kconfig
lib/Makefile