]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'openrisc/for-upstream'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 02:11:19 +0000 (12:11 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 02:11:19 +0000 (12:11 +1000)
commita9b8ef7d8acd70f0b22fdfbcf50983dd02912cee
treec8b6a7de5101f52e251e63c1d16bc0694776e0ea
parented7bdca97dba0218127b6a12c9fa3df3f1d375e0
parentddf54eaa745b7a6bd563194493f0cca7587002d7
Merge remote-tracking branch 'openrisc/for-upstream'

Conflicts:
arch/openrisc/kernel/signal.c