git.alex.org.uk - linux-flexiantxendom0-natty.git/commit

projects / linux-flexiantxendom0-natty.git / commit

author	Jiri Kosina <jkosina@suse.cz>
	Mon, 8 Mar 2010 15:55:37 +0000 (16:55 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Mon, 8 Mar 2010 15:55:37 +0000 (16:55 +0100)
commit	318ae2edc3b29216abd8a2510f3f80b764f06858
tree	ce595adde342f57f379d277b25e4dd206988a052	tree \| snapshot
parent	25cf84cf377c0aae5dbcf937ea89bc7893db5176	commit \| diff
parent	3e58974027b04e84f68b964ef368a6cd758e2f84	commit \| diff

Merge branch 'for-next' into for-linus

Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c

101 files changed:

Documentation/filesystems/proc.txt	diff1 \|	diff2 \|	blob \| history
Documentation/power/runtime_pm.txt	diff1 \|	diff2 \|	blob \| history
arch/arm/common/clkdev.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/include/mach/i2c.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-3630sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-zoom-peripherals.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/include/mach/debug-macro.S	diff1 \|	diff2 \|	blob \| history
arch/ia64/sn/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/sclp.S	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/pci-dma.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tsc.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmiclock_32.c	diff1 \|	diff2 \|	blob \| history
crypto/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/acpi/dock.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-core.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-sff.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/pata_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/pata_pcmcia.c	diff1 \|	diff2 \|	blob \| history
drivers/char/agp/intel-agp.c	diff1 \|	diff2 \|	blob \| history
drivers/char/hvc_iseries.c	diff1 \|	diff2 \|	blob \| history
drivers/char/serial167.c	diff1 \|	diff2 \|	blob \| history
drivers/char/tty_io.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bios.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_state.c	diff1 \|	diff2 \|	blob \| history
drivers/input/serio/i8042.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/gspca/ov519.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/sm501.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/sdio_uart.c	diff1 \|	diff2 \|	blob \| history
drivers/net/chelsio/sge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cs89x0.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb3/sge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/82571.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ks8851.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smsc9420.c	diff1 \|	diff2 \|	blob \| history
drivers/net/spider_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sungem.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tehuti.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tokenring/tms380tr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/typhoon.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ucc_geth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wimax/i2400m/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ar9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2500usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00debug.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00queue.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt61pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt73usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/zd1211rw/zd_mac.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/thinkpad_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libfc/fc_fcp.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_els.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_regs.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/cypress_m8.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/opticon.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/symbolserial.c	diff1 \|	diff2 \|	blob \| history
fs/binfmt_elf_fdpic.c	diff1 \|	diff2 \|	blob \| history
fs/bio.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifssmb.c	diff1 \|	diff2 \|	blob \| history
fs/ext3/super.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/mballoc.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/ops_fstype.c	diff1 \|	diff2 \|	blob \| history
fs/jbd/transaction.c	diff1 \|	diff2 \|	blob \| history
fs/locks.c	diff1 \|	diff2 \|	blob \| history
fs/namei.c	diff1 \|	diff2 \|	blob \| history
fs/nfsd/nfs4xdr.c	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/dlmglue.c	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/extent_map.c	diff1 \|	diff2 \|	blob \| history
fs/reiserfs/bitmap.c	diff1 \|	diff2 \|	blob \| history
fs/udf/inode.c	diff1 \|	diff2 \|	blob \| history
include/linux/mmzone.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/chip.c	diff1 \|	diff2 \|	blob \| history
kernel/ksysfs.c	diff1 \|	diff2 \|	blob \| history
kernel/params.c	diff1 \|	diff2 \|	blob \| history
kernel/sched_cpupri.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/ring_buffer.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
mm/slub.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_timer.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh_plink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_sip.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_hashlimit.c	diff1 \|	diff2 \|	blob \| history
security/selinux/avc.c	diff1 \|	diff2 \|	blob \| history
sound/pci/rme9652/hdspm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8990.c	diff1 \|	diff2 \|	blob \| history
tools/perf/perf.c	diff1 \|	diff2 \|	blob \| history

Port of xen3.3 xenlinux code to Ubuntu Natty kernel

RSS Atom

Documentation/filesystems/proc.txt	diff1 \|	diff2 \|	blob \| history
Documentation/power/runtime_pm.txt	diff1 \|	diff2 \|	blob \| history
arch/arm/common/clkdev.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-davinci/include/mach/i2c.h	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-3630sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-zoom-peripherals.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/core.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-u300/include/mach/debug-macro.S	diff1 \|	diff2 \|	blob \| history
arch/ia64/sn/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/sclp.S	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/pci-dma.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tsc.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmiclock_32.c	diff1 \|	diff2 \|	blob \| history
crypto/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/acpi/dock.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-core.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/libata-sff.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/pata_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/ata/pata_pcmcia.c	diff1 \|	diff2 \|	blob \| history
drivers/char/agp/intel-agp.c	diff1 \|	diff2 \|	blob \| history
drivers/char/hvc_iseries.c	diff1 \|	diff2 \|	blob \| history
drivers/char/serial167.c	diff1 \|	diff2 \|	blob \| history
drivers/char/tty_io.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_bios.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_state.c	diff1 \|	diff2 \|	blob \| history
drivers/input/serio/i8042.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/gspca/ov519.c	diff1 \|	diff2 \|	blob \| history
drivers/mfd/sm501.c	diff1 \|	diff2 \|	blob \| history
drivers/mmc/card/sdio_uart.c	diff1 \|	diff2 \|	blob \| history
drivers/net/chelsio/sge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cs89x0.c	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb3/sge.c	diff1 \|	diff2 \|	blob \| history
drivers/net/davinci_emac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/82571.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ks8851.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smsc9420.c	diff1 \|	diff2 \|	blob \| history
drivers/net/spider_net.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sungem.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tehuti.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tokenring/tms380tr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/typhoon.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ucc_geth.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wimax/i2400m/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ar9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2500usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00debug.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00dev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00queue.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt61pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt73usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/zd1211rw/zd_mac.c	diff1 \|	diff2 \|	blob \| history
drivers/platform/x86/thinkpad_acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/libfc/fc_fcp.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_els.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/lpfc/lpfc_scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_regs.h	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/cypress_m8.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/opticon.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/symbolserial.c	diff1 \|	diff2 \|	blob \| history
fs/binfmt_elf_fdpic.c	diff1 \|	diff2 \|	blob \| history
fs/bio.c	diff1 \|	diff2 \|	blob \| history
fs/cifs/cifssmb.c	diff1 \|	diff2 \|	blob \| history
fs/ext3/super.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/mballoc.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/super.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/ops_fstype.c	diff1 \|	diff2 \|	blob \| history
fs/jbd/transaction.c	diff1 \|	diff2 \|	blob \| history
fs/locks.c	diff1 \|	diff2 \|	blob \| history
fs/namei.c	diff1 \|	diff2 \|	blob \| history
fs/nfsd/nfs4xdr.c	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/dlmglue.c	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/extent_map.c	diff1 \|	diff2 \|	blob \| history
fs/reiserfs/bitmap.c	diff1 \|	diff2 \|	blob \| history
fs/udf/inode.c	diff1 \|	diff2 \|	blob \| history
include/linux/mmzone.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/irq/chip.c	diff1 \|	diff2 \|	blob \| history
kernel/ksysfs.c	diff1 \|	diff2 \|	blob \| history
kernel/params.c	diff1 \|	diff2 \|	blob \| history
kernel/sched_cpupri.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/ring_buffer.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.h	diff1 \|	diff2 \|	blob \| history
mm/slub.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_timer.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh_plink.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/nf_conntrack_sip.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/xt_hashlimit.c	diff1 \|	diff2 \|	blob \| history
security/selinux/avc.c	diff1 \|	diff2 \|	blob \| history
sound/pci/rme9652/hdspm.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8990.c	diff1 \|	diff2 \|	blob \| history
tools/perf/perf.c	diff1 \|	diff2 \|	blob \| history