]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'random/dev'
authorThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:50:22 +0000 (11:50 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 25 Oct 2013 09:50:22 +0000 (11:50 +0200)
commit7019e19439be4a9ffb1c5770bbe649dd933aca57
tree9a410708e2f98591d18d5f52cded46ea5b578960
parent27c2676200f9ccc9672f99067b12a281ae099453
parentf80bbd8b92987f55f26691cd53785c4a54622eb0
Merge remote-tracking branch 'random/dev'

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