Age | Commit message (Collapse) | Author | |
---|---|---|---|
2008-06-17 | Merge commit 'kgdb/kgdb-next' | Stephen Rothwell | |
2008-06-17 | Merge commit 'backlight/for-mm' | Stephen Rothwell | |
Conflicts: drivers/video/backlight/Kconfig drivers/video/backlight/Makefile | |||
2008-06-17 | Merge commit 'leds/for-mm' | Stephen Rothwell | |
2008-06-17 | Merge commit 'battery/master' | Stephen Rothwell | |
2008-06-17 | Merge commit 'pcmcia/master' | Stephen Rothwell | |
Conflicts: drivers/char/pcmcia/cm4000_cs.c | |||
2008-06-17 | Merge commit 'firmware/master' | Stephen Rothwell | |
Conflicts: drivers/char/ip2/ip2main.c drivers/usb/misc/isight_firmware.c drivers/usb/serial/Kconfig 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-06-17 | Merge commit 'embedded/master' | Stephen Rothwell | |
2008-06-17 | Merge commit 'trivial/next' | Stephen Rothwell | |
2008-06-17 | Merge commit 'bkl-removal/bkl-removal' | Stephen Rothwell | |
Conflicts: kernel/power/user.c | |||
2008-06-17 | 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-06-17 | Merge commit 'semaphore/semaphore' | Stephen Rothwell | |
2008-06-17 | Merge commit 'input/next' | Stephen Rothwell | |
2008-06-17 | Merge commit 'mmc/next' | Stephen Rothwell | |
2008-06-17 | Merge branch 'quilt/rr' | Stephen Rothwell | |
2008-06-17 | Merge commit 'cpufreq/next' | Stephen Rothwell | |
Conflicts: drivers/cpufreq/cpufreq.c | |||
2008-06-17 | Merge commit 'arm/devel' | Stephen Rothwell | |
Conflicts: arch/arm/mach-at91/board-yl-9200.c arch/arm/mach-pxa/tosa.c | |||
2008-06-17 | Merge commit 'crypto/master' | Stephen Rothwell | |
2008-06-17 | Merge commit 'mtd/master' | Stephen Rothwell | |
2008-06-17 | Merge commit 'sparc/master' | Stephen Rothwell | |
Conflicts: include/asm-m68k/sbus.h | |||
2008-06-17 | wireless: fix fallout from device_create removal | Stephen Rothwell | |
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> | |||
2008-06-17 | Merge commit 'net/master' | Stephen Rothwell | |
Conflicts: Documentation/powerpc/booting-without-of.txt drivers/net/wireless/rt2x00/Kconfig drivers/net/wireless/rt2x00/rt2x00usb.c net/sctp/protocol.c | |||
2008-06-17 | Merge commit 'async_tx/next' | Stephen Rothwell | |
2008-06-17 | Merge commit 'powerpc/powerpc-next' | Stephen Rothwell | |
2008-06-17 | Merge branch 'quilt/m68k' | Stephen Rothwell | |
2008-06-17 | Merge commit 'ocfs2/linux-next' | Stephen Rothwell | |
2008-06-17 | Merge commit 'tests/master' | Stephen Rothwell | |
Conflicts: lib/Kconfig.debug | |||
2008-06-17 | Merge commit 'scsi/master' | Stephen Rothwell | |
2008-06-17 | Merge commit 'ubi/master' | Stephen Rothwell | |
2008-06-17 | Merge commit 'hwmon/testing' | Stephen Rothwell | |
2008-06-17 | Merge commit 'ieee1394/for-next' | Stephen Rothwell | |
2008-06-17 | Merge commit 'acpi/test' | Stephen Rothwell | |
Conflicts: drivers/acpi/processor_throttling.c drivers/acpi/sleep/main.c | |||
2008-06-17 | Merge commit 'infiniband/for-next' | Stephen Rothwell | |
2008-06-17 | Merge commit 'libata/NEXT' | Stephen Rothwell | |
2008-06-17 | Merge branch 'quilt/ide' | Stephen Rothwell | |
2008-06-17 | Merge commit 'sh/master' | Stephen Rothwell | |
2008-06-17 | Merge commit 's390/features' | Stephen Rothwell | |
Conflicts: drivers/s390/block/dasd.c drivers/s390/block/dasd_eckd.c drivers/s390/block/dasd_fba.c drivers/s390/char/tape_core.c drivers/s390/cio/device_fsm.c drivers/s390/net/claw.c drivers/s390/net/ctcm_main.c drivers/s390/net/lcs.c | |||
2008-06-17 | Merge commit 'v4l-dvb/stable' | Stephen Rothwell | |
2008-06-17 | Merge branch 'quilt/i2c' | Stephen Rothwell | |
Conflicts: drivers/i2c/i2c-core.c | |||
2008-06-17 | Merge commit 'hid/mm' | Stephen Rothwell | |
2008-06-17 | Merge commit 'pci/linux-next' | Stephen Rothwell | |
Conflicts: include/linux/device.h | |||
2008-06-17 | Merge commit 'timers/auto-timers-next' | Stephen Rothwell | |
2008-06-17 | Merge commit 'sched/auto-sched-next' | Stephen Rothwell | |
Conflicts: kernel/Makefile | |||
2008-06-17 | Merge commit 'cpus4096/auto-cpus4096-next' | Stephen Rothwell | |
2008-06-17 | Merge commit 'tip-core/auto-core-next' | Stephen Rothwell | |
2008-06-17 | Merge branch 'quilt/usb' | Stephen Rothwell | |
2008-06-17 | Merge branch 'quilt/driver-core' | Stephen Rothwell | |
Conflicts: drivers/scsi/hosts.c | |||
2008-06-17 | Merge commit 'input-current/for-linus' | Stephen Rothwell | |
2008-06-17 | Merge branch 'quilt/usb.current' | Stephen Rothwell | |
2008-06-17 | Merge branch 'quilt/driver-core.current' | Stephen Rothwell | |
2008-06-17 | Merge commit 'net-current/master' | Stephen Rothwell | |