Merge commit 'v2.6.32.47' into HEAD

* commit 'v2.6.32.47': (111 commits)
  Linux 2.6.32.47
  USB: Serial: Add PID(0xF7C0) to FTDI SIO driver for a zeitcontrol-device
  USB: Serial: Add device ID for Sierra Wireless MC8305
  ext2,ext3,ext4: don't inherit APPEND_FL or IMMUTABLE_FL for new inodes
  drivers/net/rionet.c: fix ethernet address macros for LE platforms
  ext4: fix BUG_ON() in ext4_ext_insert_extent()
  net_sched: Fix qdisc_notify()
  nl80211: fix overflow in ssid_len
  Bluetooth: Prevent buffer overflow in l2cap config request
  vm: fix vm_pgoff wrap in upward expansion
  vm: fix vm_pgoff wrap in stack expansion
  Bluetooth: l2cap and rfcomm: fix 1 byte infoleak to userspace.
  NLM: Don't hang forever on NLM unlock requests
  deal with races in /proc/*/{syscall,stack,personality}
  scm: lower SCM_MAX_FD
  thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.
  kcore: fix test for end of list
  watchdog: mtx1-wdt: fix build failure
  Revert "MIPS: MTX-1: Make au1000_eth probe all PHY
  Revert "usb: musb: restore INDEX register in resume path"
  ...

Conflicts:
	drivers/block/xen-blkfront.c