aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-07-27 11:35:26 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-07-27 11:35:26 -0400
commitb387e41e523c1aa347cff055455d0dd129357df4 (patch)
tree736b8f4ff0c683031d2f642c182fd01ed73be5d1 /net
parent43a1141b9f4fd9453b43ba5e8f136e7d47220dde (diff)
parentbac821a6e3404330d509fd3a245bf7701f210c7c (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt: "Here's a handful of powerpc patches, a couple of regression fixes for problems introduced in the main batch in this merge window, a couple of defconfig updates, and some trivials. The radeonfb one is something that was long standing in SLES which I forgot to pickup earlier." * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/ftrace: Trace function graph entry before updating index radeonfb: Add quirk for the graphics adapter in some JSxx powerpc: Lack of firmware flash support is not an error powerpc: Enable pseries hardware RNG and crypto modules powerpc: Update g5_defconfig powerpc/kvm/bookehv: Fix build regression powerpc: Set stack limit properly in crit_transfer_to_handler
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions