[git pull] Please pull powerpc.git merge branch (updated)

[Kumar Gala]

Ben,

Added a watchdog fix.

- k

The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee:

  Linux 3.6-rc1 (2012-08-02 16:38:10 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git merge

for you to fetch changes up to 127c6e731106a2071ee4a6c5a34c471cd3e719f0:

  booke/wdt: some ioctls do not return values properly (2012-08-17 09:03:51 -0500)

----------------------------------------------------------------
Jia Hongtao (1):
      powerpc/fsl-pci: Only scan PCI bus if configured as a host

Shengzhou Liu (1):
      powerpc/p4080ds: dts - add usb controller version info and port0

Tiejun Chen (1):
      booke/wdt: some ioctls do not return values properly

Zhao Chenhui (1):
      powerpc/85xx: mpc85xx_defconfig - add VIA PATA support for MPC85xxCDS

 arch/powerpc/boot/dts/fsl/p4080si-post.dtsi |    7 +++++++
 arch/powerpc/configs/mpc85xx_defconfig      |    1 +
 arch/powerpc/sysdev/fsl_pci.c               |   13 ++++++++-----
 drivers/watchdog/booke_wdt.c                |    7 +++----
 4 files changed, 19 insertions(+), 9 deletions(-)