projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
10e4ac5
cc39c6a
)
Merge branch 'master' into for-next
author
Jiri Kosina
<jkosina@suse.cz>
Thu, 15 Sep 2011 13:08:05 +0000
(15:08 +0200)
committer
Jiri Kosina
<jkosina@suse.cz>
Thu, 15 Sep 2011 13:08:18 +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
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/kernel/process_32.c
patch
|
diff1
|
diff2
|
blob
|
history
arch/x86/mm/mmio-mod.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/atm/idt77252.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/block/drbd/drbd_nl.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/block/rbd.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/radeon/radeon_fence.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/media/radio/wl128x/fmdrv_v4l2.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/atlx/atl1.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/rtlwifi/pci.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/bfa/bfad_drv.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/fcoe/fcoe.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/isci/phy.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/mpt2sas/mpt2sas_scsih.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/mvsas/mv_sas.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/scsi/pmcraid.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/target/target_core_fabric_configfs.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/target/target_core_pr.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/target/target_core_rd.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/target/target_core_transport.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/target/tcm_fc/tfc_cmd.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/target/tcm_fc/tfc_conf.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/target/tcm_fc/tfc_io.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/tty/serial/mrst_max3110.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/gadget/uvc_v4l2.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/usb/musb/musb_gadget.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/eventpoll.c
patch
|
diff1
|
diff2
|
blob
|
history
fs/xfs/kmem.h
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/ceph/messenger.h
patch
|
diff1
|
diff2
|
blob
|
history
kernel/futex.c
patch
|
diff1
|
diff2
|
blob
|
history
lib/idr.c
patch
|
diff1
|
diff2
|
blob
|
history
mm/vmscan.c
patch
|
diff1
|
diff2
|
blob
|
history
scripts/checkpatch.pl
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-omap2/smartreflex.c
Simple merge
diff --cc
arch/x86/kernel/process_32.c
Simple merge
diff --cc
arch/x86/mm/mmio-mod.c
Simple merge
diff --cc
drivers/atm/idt77252.c
Simple merge
diff --cc
drivers/block/drbd/drbd_nl.c
Simple merge
diff --cc
drivers/block/rbd.c
Simple merge
diff --cc
drivers/gpu/drm/radeon/radeon_fence.c
Simple merge
diff --cc
drivers/media/radio/wl128x/fmdrv_v4l2.c
Simple merge
diff --cc
drivers/net/atlx/atl1.c
Simple merge
diff --cc
drivers/net/wireless/rtlwifi/pci.c
Simple merge
diff --cc
drivers/scsi/bfa/bfad_drv.h
Simple merge
diff --cc
drivers/scsi/fcoe/fcoe.c
Simple merge
diff --cc
drivers/scsi/isci/phy.c
Simple merge
diff --cc
drivers/scsi/mpt2sas/mpt2sas_scsih.c
Simple merge
diff --cc
drivers/scsi/mvsas/mv_sas.h
Simple merge
diff --cc
drivers/scsi/pmcraid.c
Simple merge
diff --cc
drivers/target/target_core_fabric_configfs.c
Simple merge
diff --cc
drivers/target/target_core_pr.c
Simple merge
diff --cc
drivers/target/target_core_rd.c
Simple merge
diff --cc
drivers/target/target_core_transport.c
Simple merge
diff --cc
drivers/target/tcm_fc/tfc_cmd.c
Simple merge
diff --cc
drivers/target/tcm_fc/tfc_conf.c
Simple merge
diff --cc
drivers/target/tcm_fc/tfc_io.c
Simple merge
diff --cc
drivers/tty/serial/mrst_max3110.c
Simple merge
diff --cc
drivers/usb/gadget/uvc_v4l2.c
Simple merge
diff --cc
drivers/usb/musb/musb_gadget.c
Simple merge
diff --cc
fs/eventpoll.c
Simple merge
diff --cc
fs/xfs/kmem.h
Simple merge
diff --cc
include/linux/ceph/messenger.h
Simple merge
diff --cc
kernel/futex.c
Simple merge
diff --cc
lib/idr.c
Simple merge
diff --cc
mm/vmscan.c
Simple merge
diff --cc
scripts/checkpatch.pl
Simple merge