Age | Commit message (Collapse) | Author | |
---|---|---|---|
2008-12-30 | Revert "cpumask: add sysfs displays for configured and disabled cpu maps" | Stephen Rothwell | |
This reverts commit e057d7aea9d8f2a46cd440d8bfb72245d4e72d79. | |||
2008-12-30 | driver core: fix root_device_register for not CONFIG_MODULES | Stephen Rothwell | |
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> | |||
2008-12-30 | Merge commit 'scsi-post-merge/master' | Stephen Rothwell | |
2008-12-30 | Merge branch 'quilt/staging' | Stephen Rothwell | |
Conflicts: drivers/staging/winbond/linux/wbusb.c drivers/staging/wlan-ng/p80211netdev.c drivers/staging/wlan-ng/p80211wext.c | |||
2008-12-30 | Merge commit 'trivial/for-next' | Stephen Rothwell | |
2008-12-30 | Merge commit 'boot-params/master' | Stephen Rothwell | |
Conflicts: arch/arm/kernel/setup.c arch/parisc/kernel/setup.c arch/sh/boards/mach-microdev/setup.c arch/sh/boards/mach-migor/setup.c arch/x86/kernel/cpu/common.c drivers/usb/core/usb.c init/main.c | |||
2008-12-30 | Merge commit 'osd/linux-next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'cputime/cputime' | Stephen Rothwell | |
Conflicts: kernel/sched.c | |||
2008-12-29 | Merge commit 'dwmw2-iommu/master' | Stephen Rothwell | |
2008-12-29 | Merge commit 'watchdog/master' | Stephen Rothwell | |
2008-12-29 | Merge commit 'uwb/for-upstream' | Stephen Rothwell | |
Conflicts: drivers/usb/wusbcore/rh.c drivers/uwb/wlp/eda.c | |||
2008-12-29 | Merge commit 'sparseirq/auto-sparseirq-next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'oprofile/auto-oprofile-next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'agp/agp-next' | Stephen Rothwell | |
2008-12-29 | Merge branch 'quilt/ttydev' | Stephen Rothwell | |
Conflicts: fs/devpts/inode.c | |||
2008-12-29 | Merge commit 'voltage/for-next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'drm/drm-next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'mfd/for-next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'md/for-next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'backlight/for-mm' | Stephen Rothwell | |
2008-12-29 | Merge commit 'leds/for-mm' | Stephen Rothwell | |
2008-12-29 | Merge commit 'firmware/master' | Stephen Rothwell | |
Conflicts: drivers/net/tg3.c firmware/Makefile firmware/WHENCE | |||
2008-12-29 | Merge commit 'block/for-next' | Stephen Rothwell | |
Conflicts: fs/bio.c | |||
2008-12-29 | Merge commit 'bkl-removal/bkl-removal' | Stephen Rothwell | |
Conflicts: fs/ioctl.c | |||
2008-12-29 | Merge commit 'input/next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'mmc/next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'rr_cpumask/master' | Stephen Rothwell | |
Conflicts: kernel/sched.c | |||
2008-12-29 | Merge commit 'cpufreq/next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'mtd/master' | Stephen Rothwell | |
Conflicts: arch/arm/mach-pxa/corgi.c arch/arm/mach-pxa/poodle.c arch/arm/mach-pxa/spitz.c drivers/mtd/devices/m25p80.c drivers/mtd/devices/mtd_dataflash.c | |||
2008-12-29 | Merge commit 'async_tx/next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'scsi/master' | Stephen Rothwell | |
2008-12-29 | Merge commit 'ubi/linux-next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'ieee1394/for-next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'acpi/test' | Stephen Rothwell | |
2008-12-29 | Merge commit 'libata/NEXT' | Stephen Rothwell | |
2008-12-29 | Merge branch 'quilt/ide' | Stephen Rothwell | |
2008-12-29 | Merge commit 'v4l-dvb/master' | Stephen Rothwell | |
2008-12-29 | Merge branch 'quilt/jdelvare-hwmon' | Stephen Rothwell | |
2008-12-29 | Merge branch 'quilt/i2c' | Stephen Rothwell | |
2008-12-29 | Merge commit 'hid/for-next' | Stephen Rothwell | |
2008-12-29 | Merge branch 'quilt/device-mapper' | Stephen Rothwell | |
Conflicts: drivers/md/dm.c | |||
2008-12-29 | Merge commit 'pci/linux-next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'timers/auto-timers-next' | Stephen Rothwell | |
Conflicts: kernel/time/tick-sched.c sound/drivers/pcsp/pcsp.c | |||
2008-12-29 | Merge commit 'genirq/auto-genirq-next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'ftrace/auto-ftrace-next' | Stephen Rothwell | |
2008-12-29 | Merge commit 'cpus4096/auto-cpus4096-next' | Stephen Rothwell | |
2008-12-29 | Merge branch 'quilt/usb' | Stephen Rothwell | |
Conflicts: Documentation/DocBook/networking.tmpl | |||
2008-12-29 | Merge branch 'quilt/driver-core' | Stephen Rothwell | |
Conflicts: arch/powerpc/platforms/85xx/mpc85xx_mds.c | |||
2008-12-29 | Merge commit 'sparc/master' | Stephen Rothwell | |
Conflicts: arch/sparc64/kernel/idprom.c | |||
2008-12-29 | Merge commit 'powerpc/next' | Stephen Rothwell | |
Conflicts: drivers/char/Makefile |