Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 29 Jan 2013 00:33:37 +0000 (11:33 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 29 Jan 2013 00:33:37 +0000 (11:33 +1100)
commitdfd0436ad0ce139467b124c646fa65ee2635e14a
treeabf9d83c704417cdd484243c12aeffee6b185aba
parentb9818c3312da66f4b83a4a2e8650628be1237cb5
parent689dfa894c57842a05bf6dc9f97e6bb71ec5f386
Merge branch 'merge' into next

Merge "merge" branch to bring in various bug fixes that are
going into 3.8
arch/powerpc/kernel/entry_64.S
arch/powerpc/kernel/kgdb.c