Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Tue, 26 Apr 2011 08:22:15 +0000 (10:22 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 26 Apr 2011 08:22:59 +0000 (10:22 +0200)
commit07f9479a40cc778bc1462ada11f95b01360ae4ff
tree0676cf38df3844004bb3ebfd99dfa67a4a8998f5
parent9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf
parentcd2e49e90f1cae7726c9a2c54488d881d7f1cd1c
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.
28 files changed:
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