Merge branch 'master' into for-next
Jiri Kosina [Thu, 15 Sep 2011 13:08:05 +0000 (15:08 +0200)]
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.

33 files changed:
1  2 
arch/arm/mach-omap2/smartreflex.c
arch/x86/kernel/process_32.c
arch/x86/mm/mmio-mod.c
drivers/atm/idt77252.c
drivers/block/drbd/drbd_nl.c
drivers/block/rbd.c
drivers/gpu/drm/radeon/radeon_fence.c
drivers/media/radio/wl128x/fmdrv_v4l2.c
drivers/net/atlx/atl1.c
drivers/net/wireless/rtlwifi/pci.c
drivers/scsi/bfa/bfad_drv.h
drivers/scsi/fcoe/fcoe.c
drivers/scsi/isci/phy.c
drivers/scsi/mpt2sas/mpt2sas_scsih.c
drivers/scsi/mvsas/mv_sas.h
drivers/scsi/pmcraid.c
drivers/target/target_core_fabric_configfs.c
drivers/target/target_core_pr.c
drivers/target/target_core_rd.c
drivers/target/target_core_transport.c
drivers/target/tcm_fc/tfc_cmd.c
drivers/target/tcm_fc/tfc_conf.c
drivers/target/tcm_fc/tfc_io.c
drivers/tty/serial/mrst_max3110.c
drivers/usb/gadget/uvc_v4l2.c
drivers/usb/musb/musb_gadget.c
fs/eventpoll.c
fs/xfs/kmem.h
include/linux/ceph/messenger.h
kernel/futex.c
lib/idr.c
mm/vmscan.c
scripts/checkpatch.pl

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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/eventpoll.c
Simple merge
diff --cc fs/xfs/kmem.h
Simple merge
Simple merge
diff --cc kernel/futex.c
Simple merge
diff --cc lib/idr.c
Simple merge
diff --cc mm/vmscan.c
Simple merge
Simple merge