projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6ec22f9 6070d81)
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
tree63626829498e647ba058a1ce06419fe7e4d5f97dtree | snapshot
parent6ec22f9b037fc0c2e00ddb7023fad279c365324dcommit | diff
parent6070d81eb5f2d4943223c96e7609a53cdc984364commit | diff
Merge branch 'for-next' into for-linus

Conflicts:

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