Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.

diff --cc CREDITS
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-at91/at91cap9_devices.c
Simple merge

diff --cc arch/arm/mach-tegra/tegra2_clocks.c
Simple merge

diff --cc arch/mips/sgi-ip22/ip22-int.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_fence.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_ring.c
Simple merge

diff --cc drivers/leds/leds-mc13783.c
Simple merge

diff --cc drivers/net/can/softing/softing_main.c
Simple merge

diff --cc drivers/net/sgiseeq.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/pci.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_bsg.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_isr.c
Simple merge

diff --cc drivers/target/target_core_alua.c
Simple merge

diff --cc drivers/target/target_core_transport.c
Simple merge

diff --cc drivers/tty/serial/mrst_max3110.c
Simple merge

diff --cc drivers/tty/tty_ioctl.c
Simple merge

diff --cc fs/logfs/readwrite.c
Simple merge

diff --cc fs/ocfs2/refcounttree.c
Simple merge

diff --cc fs/partitions/ldm.c
Simple merge

diff --cc fs/ufs/inode.c
Simple merge

diff --cc include/video/newport.h
index db9d9e3d6cc00bf324ad6d0d0235030114fece87,3d7c4b492ec61944c3af0cef9a56c30d7f23badd..de980a3b60c93a2fe788a9eac8ad6be5bf13b6f3
--- 1/include/video/newport.h
--- 2/include/video/newport.h
+++ b/include/video/newport.h
@@@ -3,9 -3,9 +3,9 @@@
   * newport.h: Defines and register layout for NEWPORT graphics
   *            hardware.
   *
 - * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
 + * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
   * 
-  * Ulf Carlsson - Compability with the IRIX structures added
+  * Ulf Carlsson - Compatibility with the IRIX structures added
   */
  
  #ifndef _SGI_NEWPORT_H

diff --cc lib/Kconfig.debug
index b38cc34281b86414c585050cd932f6112394e501,c768bcdda1b700331a991cad681c5c2d6862c419..a86bec1ffee3a29bb1816b0cf647bb1a123886b8
--- 1/lib/Kconfig.debug
--- 2/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -7,9 -7,19 +7,20 @@@ config PRINTK_TIM
          included in printk output.  This allows you to measure
          the interval between kernel operations, including bootup
          operations.  This is useful for identifying long delays
 -        in kernel startup.
 +        in kernel startup.  Or add printk.time=1 at boot-time.
 +        See Documentation/kernel-parameters.txt
  
+ config DEFAULT_MESSAGE_LOGLEVEL
+       int "Default message log level (1-7)"
+       range 1 7
+       default "4"
+       help
+         Default log level for printk statements with no specified priority.
+ 
+         This was hard-coded to KERN_WARNING since at least 2.6.10 but folks
+         that are auditing their logs closely may want to set it to a lower
+         priority.
+ 
  config ENABLE_WARN_DEPRECATED
        bool "Enable __deprecated logic"
        default y

diff --cc lib/vsprintf.c
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/netfilter/ipset/ip_set_bitmap_ip.c
Simple merge