tree 05d3785c0a4720c63fa7a7d9372ba24904b5049a
parent eda1be631a1efa3985b408a231ba20e1ecf0a92b
parent cb8fdc69a2a80e81e1280ec58afd2c3217ac8a7f
author Linus Torvalds <torvalds@linux-foundation.org> 1226424271 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1226424271 -0800

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: Update desktop/server defconfigs
  powerpc: Fix msr check in compat_sys_swapcontext
  powerpc: Repair device bindings documentation
  powerpc: Updated Freescale PPC related defconfigs
  powerpc: Update QE/CPM2 usb_ctlr structures for USB support
  powerpc/86xx: Correct SOC bus-frequency in GE Fanuc SBC610 DTS
  powerpc: Fix Book-E watchdog timer interval setting
  powerpc/fsl-booke: Fix synchronization bug w/local tlb invalidates