]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 02:39:22 +0000 (13:39 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 02:39:22 +0000 (13:39 +1100)
commitcb208d3c3daba54c141d697a6b39376a708872d3
tree48c8f3d580116fca4e44a15b48f7da6cf3ac1662
parentc4fc682a33780b792ed46354da7fc1298eed4a43
parentd4a82a4a033d563f1dc2c944eec2358cb38432d0
Merge remote-tracking branch 'security/next'

Conflicts:
drivers/char/tpm/tpm_ppi.c
MAINTAINERS