]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'kgdb/kgdb-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 02:34:12 +0000 (13:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 8 Jan 2014 02:34:12 +0000 (13:34 +1100)
Conflicts:
kernel/debug/debug_core.h


Trivial merge