]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'random/dev'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 27 Sep 2013 07:31:07 +0000 (17:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 27 Sep 2013 07:31:07 +0000 (17:31 +1000)
commit888324a7cc75d5b39a5c8407d18791ea25b770aa
tree317ba8f51f5609ad997e76c5494a2e2b4be289e4
parentafde8cb0f6517d97d37f1061d108032703cb3bfc
parent45ee64e1f474fa027efa966fbe8db8df700d18e5
Merge remote-tracking branch 'random/dev'

Conflicts:
init/main.c
drivers/char/random.c
include/linux/timex.h
init/main.c