Age | Commit message (Collapse) | Author | |
---|---|---|---|
2008-12-17 | Add linux-next specific files for 20081217next-20081217 | Stephen Rothwell | |
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> | |||
2008-12-17 | Revert "Merge commit 'mtd/master'" | Stephen Rothwell | |
This reverts commit b34ce1a888196f5b323b4cb14afd61f16c90359f. | |||
2008-12-17 | Merge commit 'v4l-dvb/master' | Stephen Rothwell | |
2008-12-17 | 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-17 | Merge commit 'trivial/for-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'jc_docs/docs-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'fuse/for-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'fatfs/master' | Stephen Rothwell | |
2008-12-17 | Merge commit 'osd/linux-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'cputime/cputime' | Stephen Rothwell | |
Conflicts: kernel/sched.c | |||
2008-12-17 | Merge commit 'dwmw2-iommu/master' | Stephen Rothwell | |
2008-12-17 | Merge commit 'proc/proc' | Stephen Rothwell | |
2008-12-17 | Merge commit 'watchdog/master' | Stephen Rothwell | |
Conflicts: drivers/watchdog/iTCO_wdt.c | |||
2008-12-17 | Merge commit 'uwb/for-upstream' | Stephen Rothwell | |
2008-12-17 | Merge commit 'iommu/auto-iommu-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'sparseirq/auto-sparseirq-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'oprofile/auto-oprofile-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'agp/agp-next' | Stephen Rothwell | |
2008-12-17 | Merge branch 'quilt/ttydev' | Stephen Rothwell | |
Conflicts: fs/devpts/inode.c | |||
2008-12-17 | Merge commit 'lblnet/master' | Stephen Rothwell | |
Conflicts: Documentation/feature-removal-schedule.txt | |||
2008-12-17 | Merge commit 'security-testing/next' | Stephen Rothwell | |
Conflicts: drivers/char/tty_audit.c fs/cifs/cifs_fs_sb.h fs/ocfs2/namei.c fs/xfs/linux-2.6/xfs_cred.h fs/xfs/linux-2.6/xfs_globals.h fs/xfs/linux-2.6/xfs_ioctl.c fs/xfs/xfs_vnodeops.h | |||
2008-12-17 | Merge commit 'voltage/for-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'drm/drm-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'hdlc/hdlc-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'mfd/for-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'kmemcheck/auto-kmemcheck-next' | Stephen Rothwell | |
Conflicts: MAINTAINERS arch/x86/mm/Makefile mm/slab.c mm/slub.c | |||
2008-12-17 | Merge commit 'md/for-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'slab/for-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'kgdb/kgdb-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'backlight/for-mm' | Stephen Rothwell | |
2008-12-17 | Merge commit 'leds/for-mm' | Stephen Rothwell | |
2008-12-17 | Merge commit 'firmware/master' | Stephen Rothwell | |
Conflicts: drivers/net/tg3.c firmware/Makefile firmware/WHENCE | |||
2008-12-17 | Merge commit 'block/for-next' | Stephen Rothwell | |
Conflicts: fs/bio.c | |||
2008-12-17 | Merge commit 'ubifs/linux-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'bkl-removal/bkl-removal' | Stephen Rothwell | |
Conflicts: fs/ioctl.c | |||
2008-12-17 | Merge commit 'input/next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'gfs2/master' | Stephen Rothwell | |
2008-12-17 | Merge commit 'mmc/next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'cifs/master' | Stephen Rothwell | |
Conflicts: fs/cifs/connect.c | |||
2008-12-17 | Merge branch 'quilt/rr' | Stephen Rothwell | |
Conflicts: kernel/sched.c | |||
2008-12-17 | Merge commit 'rr_cpumask/master' | Stephen Rothwell | |
Conflicts: arch/x86/kernel/io_apic.c kernel/sched.c kernel/sched_stats.h | |||
2008-12-17 | Merge commit 'v9fs/for-next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'cpufreq/next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'sound/for-next' | Stephen Rothwell | |
Conflicts: sound/drivers/pcsp/pcsp.c | |||
2008-12-17 | Merge commit 'crypto/master' | Stephen Rothwell | |
2008-12-17 | 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 | |||
2008-12-17 | Merge commit 'net/master' | Stephen Rothwell | |
Conflicts: arch/sparc64/kernel/idprom.c fs/lockd/host.c fs/lockd/mon.c | |||
2008-12-17 | Merge commit 'udf/for_next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'async_tx/next' | Stephen Rothwell | |
2008-12-17 | Merge commit 'ext4/next' | Stephen Rothwell | |