aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-28 16:23:07 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-28 16:23:07 -0800
commitfc16e884a2320198b8cb7bc2fdcf6b4485e79709 (patch)
treed98d1938ab0fb7bcc02193772936f8dec6c22661 /net
parentf94d4fe0b5bbe8385245a1d9ef11d785c05df0da (diff)
parent689dfa894c57842a05bf6dc9f97e6bb71ec5f386 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt: "Whenever you have a chance between two dives, you might want to consider pulling my merge branch to pickup a few fixes for 3.8 that have been accumulating for the last couple of weeks (I was myself travelling then on vacation). Nothing major, just a handful of powerpc bug fixes that I consider worth getting in before 3.8 goes final." And I'll have everybody know that I'm not diving for several days yet. Snif. * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Max next_tb to prevent from replaying timer interrupt powerpc: kernel/kgdb.c: Fix memory leakage powerpc/book3e: Disable interrupt after preempt_schedule_irq powerpc/oprofile: Fix error in oprofile power7_marked_instr_event() function powerpc/pasemi: Fix crash on reboot powerpc: Fix MAX_STACK_TRACE_ENTRIES too low warning for ppc32
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions