summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2008-12-17Revert "Merge commit 'mtd/master'"Stephen Rothwell
This reverts commit b34ce1a888196f5b323b4cb14afd61f16c90359f.
2008-12-17Merge commit 'v4l-dvb/master'Stephen Rothwell
2008-12-17Merge commit 'fuse/for-next'Stephen Rothwell
2008-12-17Merge commit 'osd/linux-next'Stephen Rothwell
2008-12-17Merge commit 'cputime/cputime'Stephen Rothwell
Conflicts: kernel/sched.c
2008-12-17Merge commit 'dwmw2-iommu/master'Stephen Rothwell
2008-12-17Merge commit 'uwb/for-upstream'Stephen Rothwell
2008-12-17Merge commit 'oprofile/auto-oprofile-next'Stephen Rothwell
2008-12-17Merge branch 'quilt/ttydev'Stephen Rothwell
Conflicts: fs/devpts/inode.c
2008-12-17Merge commit 'lblnet/master'Stephen Rothwell
Conflicts: Documentation/feature-removal-schedule.txt
2008-12-17Merge 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-17Merge commit 'drm/drm-next'Stephen Rothwell
2008-12-17Merge commit 'mfd/for-next'Stephen Rothwell
2008-12-17Merge commit 'kmemcheck/auto-kmemcheck-next'Stephen Rothwell
Conflicts: MAINTAINERS arch/x86/mm/Makefile mm/slab.c mm/slub.c
2008-12-17Merge commit 'md/for-next'Stephen Rothwell
2008-12-17Merge commit 'slab/for-next'Stephen Rothwell
2008-12-17Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2008-12-17Merge commit 'leds/for-mm'Stephen Rothwell
2008-12-17Merge commit 'block/for-next'Stephen Rothwell
Conflicts: fs/bio.c
2008-12-17Merge commit 'input/next'Stephen Rothwell
2008-12-17Merge commit 'gfs2/master'Stephen Rothwell
2008-12-17Merge commit 'mmc/next'Stephen Rothwell
2008-12-17Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: kernel/sched.c
2008-12-17Merge commit 'rr_cpumask/master'Stephen Rothwell
Conflicts: arch/x86/kernel/io_apic.c kernel/sched.c kernel/sched_stats.h
2008-12-17Merge commit 'cpufreq/next'Stephen Rothwell
2008-12-17Merge commit 'sound/for-next'Stephen Rothwell
Conflicts: sound/drivers/pcsp/pcsp.c
2008-12-17Merge commit 'crypto/master'Stephen Rothwell
2008-12-17Merge 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-17Merge commit 'net/master'Stephen Rothwell
Conflicts: arch/sparc64/kernel/idprom.c fs/lockd/host.c fs/lockd/mon.c
2008-12-17Merge commit 'async_tx/next'Stephen Rothwell
2008-12-17Merge commit 'ext4/next'Stephen Rothwell
2008-12-17Merge commit 'ocfs2/linux-next'Stephen Rothwell
2008-12-17Merge commit 'kvm/master'Stephen Rothwell
Conflicts: arch/x86/kernel/reboot.c
2008-12-17Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-12-17Merge commit 'nfsd/nfsd-next'Stephen Rothwell
2008-12-17Merge commit 'acpi/test'Stephen Rothwell
2008-12-17Merge commit 'xfs/master'Stephen Rothwell
Conflicts: fs/xfs/xfs_rename.c
2008-12-17Merge commit 'libata/NEXT'Stephen Rothwell
2008-12-17Merge branch 'quilt/ide'Stephen Rothwell
2008-12-17Merge branch 'quilt/i2c'Stephen Rothwell
2008-12-17Merge commit 'hid/for-next'Stephen Rothwell
2008-12-17Merge branch 'quilt/device-mapper'Stephen Rothwell
Conflicts: drivers/md/dm.c
2008-12-17Merge branch 'next' of ../develMauro Carvalho Chehab
* 'next' of ../devel: (407 commits) V4L/DVB (9905): v4l2-compat32: add missing newline after kernel message V4L/DVB (9904): v4l: fix compile warning. V4L/DVB (9903): uvcvideo: V4L2 zoom controls support V4L/DVB (9902): uvcvideo: V4L2 privacy control support V4L/DVB (9899): v4l2: Add missing control names V4L/DVB (9898): v4l2: Add privacy control V4L/DVB (9897): v4l2: Add camera zoom controls V4L/DVB (9895): cx18: Refine the firmware load and firmware startup process V4L/DVB (9894): cx18: Use a known open task handle when setting stream CX2341x parameters V4L/DVB (9893): cx18: Convert some list manipulations to emphasize entries not lists V4L/DVB (9892): cx18: VBI comment corrections and comments about VBI issues V4L/DVB (9891): cx18 Replace magic number 63 with CX18_MAX_FW_MDLS_PER_STREAM V4L/DVB (9889): CX24113: Fixed more typos V4L/DVB (9888): Patch: fix a typo in cx24113.c V4L/DVB (9887): Minor fixes for cx24113-driver (codingstyle) V4L/DVB (9884): gspca - ov534: Fix a warning when compilation without GSPCA_DEBUG. V4L/DVB (9883): gspca - ov534: Show sensor ID. V4L/DVB (9882): gspca - ov534: Fix typo. V4L/DVB (9880): gspca - vc032x: Add V&H flips and sharpness controls for sensor po1200. V4L/DVB (9879): gspca - vc032x: Remove the unused quality/qindex. ... Conflicts: drivers/media/dvb/b2c2/Kconfig
2008-12-17Merge commit 'pci/linux-next'Stephen Rothwell
2008-12-17Merge commit 'timers/auto-timers-next'Stephen Rothwell
2008-12-17Merge commit 'stackprotector/auto-stackprotector-next'Stephen Rothwell
2008-12-17Merge commit 'safe-poison-pointers/auto-safe-poison-pointers-next'Stephen Rothwell
2008-12-17Merge commit 'genirq/auto-genirq-next'Stephen Rothwell
2008-12-17Merge commit 'ftrace/auto-ftrace-next'Stephen Rothwell
2008-12-17Merge commit 'cpus4096/auto-cpus4096-next'Stephen Rothwell
Conflicts: scripts/recordmcount.pl