]> git.karo-electronics.de Git - linux-beck.git/commit
Merge branch 'for-next' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 7 Dec 2009 17:36:35 +0000 (18:36 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 7 Dec 2009 17:36:35 +0000 (18:36 +0100)
commitd014d043869cdc591f3a33243d3481fa4479c2d0
tree63626829498e647ba058a1ce06419fe7e4d5f97d
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d
parent6070d81eb5f2d4943223c96e7609a53cdc984364
Merge branch 'for-next' into for-linus

Conflicts:

kernel/irq/chip.c
48 files changed:
Documentation/vm/page-types.c
arch/arm/mach-s3c6410/Kconfig
arch/arm/plat-omap/dma.c
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/kprobes.c
arch/x86/mm/kmmio.c
drivers/ata/sata_fsl.c
drivers/gpu/drm/radeon/atombios.h
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/radeon/rv770.c
drivers/isdn/hardware/eicon/maintidi.c
drivers/isdn/hisax/hfc_usb.c
drivers/isdn/i4l/isdn_ppp.c
drivers/media/video/s2255drv.c
drivers/net/benet/be_cmds.h
drivers/net/benet/be_main.c
drivers/net/cxgb3/sge.c
drivers/net/s2io.c
drivers/net/smsc911x.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/ipw2x00/libipw_module.c
drivers/net/wireless/wavelan_cs.c
drivers/platform/x86/thinkpad_acpi.c
drivers/rtc/rtc-v3020.c
drivers/scsi/pmcraid.c
drivers/usb/host/ehci-hcd.c
drivers/video/atmel_lcdfb.c
drivers/video/gbefb.c
fs/btrfs/extent_map.c
fs/cifs/inode.c
fs/compat_ioctl.c
fs/ext3/inode.c
fs/ext4/inode.c
fs/ocfs2/refcounttree.c
include/net/sctp/structs.h
kernel/irq/spurious.c
kernel/perf_event.c
lib/Kconfig.debug
lib/swiotlb.c
net/sctp/sm_sideeffect.c
net/sctp/sm_statefuns.c
samples/Kconfig
security/selinux/ss/services.c
sound/pci/hda/patch_realtek.c