Age | Commit message (Collapse) | Author | |
---|---|---|---|
2008-07-03 | Merge commit 'slab/for-next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'kgdb/kgdb-next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'backlight/for-mm' | Stephen Rothwell | |
Conflicts: drivers/video/backlight/Kconfig drivers/video/backlight/Makefile | |||
2008-07-03 | Merge commit 'leds/for-mm' | Stephen Rothwell | |
2008-07-03 | Merge commit 'battery/master' | Stephen Rothwell | |
2008-07-03 | Merge commit 'pcmcia/master' | Stephen Rothwell | |
2008-07-03 | Merge commit 'firmware/master' | Stephen Rothwell | |
Conflicts: drivers/atm/Makefile drivers/char/ip2/ip2main.c drivers/media/dvb/ttpci/Makefile drivers/usb/serial/ti_fw_3410.h drivers/usb/serial/ti_fw_5052.h drivers/usb/serial/ti_usb_3410_5052.c sound/pci/Kconfig sound/pci/maestro3.c sound/pci/ymfpci/ymfpci_main.c | |||
2008-07-03 | Merge commit 'embedded/master' | Stephen Rothwell | |
2008-07-03 | Merge commit 'block/for-next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'ubifs/for_andrew' | Stephen Rothwell | |
2008-07-03 | Merge commit 'trivial/next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'bkl-removal/bkl-removal' | Stephen Rothwell | |
Conflicts: fs/nfs/file.c | |||
2008-07-03 | Merge commit 'semaphore-removal/semaphore-removal' | Stephen Rothwell | |
Conflicts: drivers/net/ps3_gelic_wireless.c drivers/scsi/qla2xxx/qla_attr.c drivers/scsi/qla2xxx/qla_def.h drivers/scsi/qla2xxx/qla_mbx.c drivers/scsi/qla2xxx/qla_mid.c drivers/scsi/qla2xxx/qla_os.c | |||
2008-07-03 | Merge commit 'semaphore/semaphore' | Stephen Rothwell | |
2008-07-03 | Merge commit 'input/next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'gfs2/master' | Stephen Rothwell | |
2008-07-03 | Merge commit 'mmc/next' | Stephen Rothwell | |
2008-07-03 | Merge branch 'quilt/rr' | Stephen Rothwell | |
Conflicts: drivers/char/hvc_console.h kernel/stop_machine.c | |||
2008-07-03 | Merge commit 'cpufreq/next' | Stephen Rothwell | |
Conflicts: drivers/cpufreq/cpufreq.c | |||
2008-07-03 | Merge commit 'arm/devel' | Stephen Rothwell | |
Conflicts: arch/arm/mach-at91/board-yl-9200.c | |||
2008-07-03 | Merge commit 'sound/master' | Stephen Rothwell | |
2008-07-03 | Merge commit 'crypto/master' | Stephen Rothwell | |
2008-07-03 | Merge commit 'wireless/master' | Stephen Rothwell | |
Conflicts: drivers/net/wireless/iwlwifi/iwl-4965.c drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
2008-07-03 | Merge commit 'mtd/master' | Stephen Rothwell | |
2008-07-03 | Merge commit 'galak/powerpc-next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'sparc/master' | Stephen Rothwell | |
Conflicts: include/asm-m68k/sbus.h | |||
2008-07-03 | Merge commit 'net/master' | Stephen Rothwell | |
Conflicts: Documentation/feature-removal-schedule.txt Documentation/powerpc/booting-without-of.txt drivers/net/fs_enet/fs_enet-main.c drivers/net/wireless/iwlwifi/iwl-4965.c | |||
2008-07-03 | Merge commit 'udf/for_next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'async_tx/next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'ext4/next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'powerpc/powerpc-next' | Stephen Rothwell | |
Conflicts: arch/powerpc/sysdev/fsl_soc.c drivers/macintosh/mediabay.c | |||
2008-07-03 | Merge branch 'quilt/m68k' | Stephen Rothwell | |
2008-07-03 | Merge commit 'selinux/for-akpm' | Stephen Rothwell | |
2008-07-03 | Merge commit 'ocfs2/linux-next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'tests/master' | Stephen Rothwell | |
Conflicts: lib/Kconfig.debug | |||
2008-07-03 | Merge commit 'ia64/test' | Stephen Rothwell | |
2008-07-03 | Merge commit 'scsi/master' | Stephen Rothwell | |
2008-07-03 | Merge commit 'dlm/next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'kvm/master' | Stephen Rothwell | |
2008-07-03 | Merge commit 'ubi/master' | Stephen Rothwell | |
2008-07-03 | Merge commit 'hwmon/testing' | Stephen Rothwell | |
2008-07-03 | Merge commit 'ieee1394/for-next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'nfsd/nfsd-next' | Stephen Rothwell | |
Conflicts: net/sunrpc/svc.c | |||
2008-07-03 | Merge commit 'acpi/test' | Stephen Rothwell | |
Conflicts: Documentation/kernel-parameters.txt arch/ia64/kernel/process.c arch/x86/kernel/process.c arch/x86/kernel/srat_32.c drivers/acpi/processor_core.c drivers/acpi/processor_throttling.c drivers/acpi/sleep/main.c include/asm-ia64/processor.h include/asm-x86/processor.h | |||
2008-07-03 | Merge commit 'infiniband/for-next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'xfs/master' | Stephen Rothwell | |
2008-07-03 | Merge commit 'nfs/linux-next' | Stephen Rothwell | |
2008-07-03 | Merge commit 'libata/NEXT' | Stephen Rothwell | |
2008-07-03 | Merge branch 'quilt/ide' | Stephen Rothwell | |
2008-07-03 | Merge commit 'kbuild/master' | Stephen Rothwell | |