Merge tag 'v3.5-rc4'

Linux 3.5-rc4

* tag 'v3.5-rc4': (9818 commits)
  Linux 3.5-rc4
  Fix typo in printed messages
  ARM: Orion: Fix Virtual/Physical mixup with watchdog
  ARM: Kirkwood: clk_register_gate_fn: add fn assignment
  ARM: Orion5x - Restore parts of io.h, with rework
  drm: drop comment about this header being autogenerated.
  ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled
  ARM: OMAP2+: mux: fix sparse warning
  ARM: OMAP2+: CM: increase the module disable timeout
  ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks
  ARM: OMAP4: hwmod data: fix 32k sync timer idle modes
  ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby
  xfs: rename log structure to xlog
  xfs: shutdown xfs_sync_worker before the log
  xfs: Fix overallocation in xfs_buf_allocate_memory()
  xfs: fix allocbt cursor leak in xfs_alloc_ag_vextent_near
  xfs: check for stale inode before acquiring iflock on push
  Btrfs: delay iput with async extents
  Btrfs: add a missing spin_lock
  Btrfs: don't assume to be on the correct extent in add_all_parents
  ...

Conflicts:
	drivers/hid/hid-ids.h

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
index 70298d13d3e9448d1dc943b60ea4e91d4c0b28cf,9373f535dfe9908c14b8ff04afbe90a981693a54..d1cdd2d284095ea7d140f93822ab3de7a0694b98
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -157,9 -160,9 +160,12 @@@
  #define USB_VENDOR_ID_AVERMEDIA               0x07ca
  #define USB_DEVICE_ID_AVER_FM_MR800   0xb800
  
 +#define USB_VENDOR_ID_AXENTIA         0x12cf
 +#define USB_DEVICE_ID_AXENTIA_FM_RADIO        0x7111
 +
+ #define USB_VENDOR_ID_BAANTO          0x2453
+ #define USB_DEVICE_ID_BAANTO_MT_190W2 0x0100
+ 
  #define USB_VENDOR_ID_BELKIN          0x050d
  #define USB_DEVICE_ID_FLIP_KVM                0x3201
  

diff --cc drivers/media/video/gspca/ov534_9.c
Simple merge

diff --cc sound/pci/es1968.c
Simple merge

diff --cc sound/pci/fm801.c
Simple merge