]> git.kernelconcepts.de Git - karo-tx-linux.git/commit - arch/powerpc/platforms/powernv/opal.c
Merge remote-tracking branch 'random/dev'
authorThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:45 +0000 (15:02 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 24 Oct 2013 13:02:45 +0000 (15:02 +0200)
commitb244a176be746a8f20b7d2321c48dda3710049f6
treebe12bd9bdb19598ec9874d24237b28be130297d2
parente1200d8a358cd07d1a39ce3275cf86241e14de02
parentf80bbd8b92987f55f26691cd53785c4a54622eb0
Merge remote-tracking branch 'random/dev'

Conflicts:
drivers/char/random.c
drivers/char/random.c