Merge branch 'master' into for-next
Jiri Kosina [Tue, 26 Apr 2011 08:22:15 +0000 (10:22 +0200)]
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.

28 files changed:
1  2 
CREDITS
MAINTAINERS
arch/arm/mach-at91/at91cap9_devices.c
arch/arm/mach-tegra/tegra2_clocks.c
arch/mips/sgi-ip22/ip22-int.c
drivers/gpu/drm/radeon/radeon_fence.c
drivers/gpu/drm/radeon/radeon_ring.c
drivers/leds/leds-mc13783.c
drivers/net/can/softing/softing_main.c
drivers/net/sgiseeq.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/rtlwifi/pci.c
drivers/scsi/lpfc/lpfc_bsg.c
drivers/scsi/qla2xxx/qla_isr.c
drivers/target/target_core_alua.c
drivers/target/target_core_transport.c
drivers/tty/serial/mrst_max3110.c
drivers/tty/tty_ioctl.c
fs/logfs/readwrite.c
fs/ocfs2/refcounttree.c
fs/partitions/ldm.c
fs/ufs/inode.c
include/video/newport.h
lib/Kconfig.debug
lib/vsprintf.c
mm/hugetlb.c
mm/page_alloc.c
net/netfilter/ipset/ip_set_bitmap_ip.c

diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/ufs/inode.c
Simple merge
@@@ -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
@@@ -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