Merge remote branch 'linus/master'

* linus/master: (1507 commits)
  FS-Cache: Add a helper to bulk uncache pages on an inode
  xen/pci: Move check for acpi_sci_override_gsi to xen_setup_acpi_sci.
  sctp: fix missing send up SCTP_SENDER_DRY_EVENT when subscribe it
  x86: Don't use the EFI reboot method by default
  net: refine {udp|tcp|sctp}_mem limits
  vmxnet3: round down # of queues to power of two
  x86, suspend: Restore MISC_ENABLE MSR in realmode wakeup
  Documentation: fix cgroup blkio throttle filenames
  Documentation: update CodingStyle memory allocators
  MAINTAINERS: move kernel-doc patches location
  FDPIC: Fix memory leak
  PM / Hibernate: Fix free_unnecessary_pages()
  resource: ability to resize an allocated resource
  fs: fix lock initialization
  net: sh_eth: fix the parameter for the ETHER of SH7757
  net: sh_eth: fix cannot work half-duplex mode
  gpio: tps65910: add missing breaks in tps65910_gpio_init
  net: vlan: enable soft features regardless of underlying device
  x86, reboot: Acer Aspire One A110 reboot quirk
  vmxnet3: fix starving rx ring whenoc_skb kb fails
  ...

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc drivers/media/video/cx23885/cx23885-cards.c
Simple merge