Merge branch 'upstream/bugfix' into upstream/xen

* upstream/bugfix: (8003 commits)
  xen: use non-tracing preempt in xen_clocksource_read()
  Linux 3.1-rc3
  xen/tracing: Fix tracing config option properly
  xen: Do not enable PV IPIs when vector callback not present
  Btrfs: fix 64 bit divide problem
  pci: fix new kernel-doc warning in pci.c
  ALSA: sound/aoa/fabrics/layout.c: remove unneeded kfree
  ALSA: hda - Fix error check from snd_hda_get_conn_index() in patch_cirrus.c
  ALSA: hda - Don't spew too many ELD errors
  ext4: flush any pending end_io requests before DIO reads w/dioread_nolock
  drm/i915: set GFX_MODE to pre-Ivybridge default value even on Ivybridge
  PCI: OF: Don't crash when bridge parent is NULL.
  Revert "cfq: Remove special treatment for metadata rqs."
  ALSA: usb-audio - Fix missing mixer dB information
  sparc: fix array bounds error setting up PCIC NMI trap
  drivers/ata/sata_dwc_460ex.c: add missing kfree
  ata: Add iMX pata support
  pata_via: disable ATAPI DMA on AVERATEC 3200
  [libata] sata_sil: fix used-uninit warning
  irqdesc: fix new kernel-doc warning
  ...