[XFS] Fix merge failures
[pandora-kernel.git] / include / linux / futex.h
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-04-30 Len BrownMerge branches 'release', 'acpica', 'bugzilla-10224...
2008-04-22 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-04-18 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-04-17 Tony LuckPull virt-cpu-accounting into release branch
2008-03-13 Len BrownMerge branches 'release', 'ejd', 'sony' and 'wmi' into...
2008-03-13 Len BrownMerge branches 'release', 'button-sysfs', 'misc', ...
2008-03-13 Len BrownMerge branches 'release', 'bugzilla-8570', 'bugzilla...
2008-03-09 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-03-06 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-03-03 Paul MackerrasMerge branch 'master' of git://git./linux/kernel/git...
2008-03-03 Paul MackerrasMerge branch 'for-2.6.25' of /linux/kernel/git/jwboyer...
2008-03-01 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-02-29 Linus TorvaldsMerge branch 'avr32-fixes' of git://git./linux/kernel...
2008-02-29 Trond MyklebustMerge branch 'cleanups' into next
2008-02-27 Christoph LameterMerge branch 'master' of git://git./linux/kernel/git...
2008-02-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-26 Paul MackerrasMerge /pub/scm/linux/kernel/git/davem/lmb-2.6
2008-02-26 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-02-24 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-02-24 David S. MillerMerge branch 'master' of ../linux-2.6/
2008-02-24 Thomas Gleixnerfutex: runtime enable pi and robust functionality
2008-02-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-07 Len BrownMerge branches 'release', 'misc' and 'misc-2.6.25'...
2008-02-07 Len BrownMerge branches 'release' and 'ppc-workaround' into...
2008-02-07 Len BrownMerge branches 'release' and 'hp-cid' into release
2008-02-07 Len BrownMerge branches 'release' and 'gpe-ack' into release
2008-02-07 Len BrownMerge branches 'release', 'cpuidle-2.6.25' and 'idle...
2008-02-07 Len BrownMerge branches 'release', 'bugzilla-6217', 'bugzilla...
2008-02-07 Len BrownMerge branches 'release' and 'autoload' into release
2008-02-07 Len BrownMerge branches 'release', 'asus', 'sony-laptop' and...
2008-02-07 Len BrownMerge branches 'release', 'acpi_pm_device_sleep_state...
2008-02-07 Josh BoyerMerge branch 'virtex-for-2.6.25' of git://git.secretlab...
2008-02-07 Paul MackerrasMerge branch 'for-2.6.25' of git://git.secretlab.ca...
2008-02-06 Linus TorvaldsMerge branch 'dmapool' of git://git./linux/kernel/git...
2008-02-03 David S. MillerMerge branch 'fixes' of /linux/kernel/git/linville...
2008-02-03 David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-02-03 David WoodhouseMerge git://git.infradead.org/~kmpark/onenand-mtd-2.6
2008-02-03 David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-02 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-02 Linus TorvaldsMerge branch 'for-linus' of git://linux-nfs.org/~bfield...
2008-02-02 Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/pci-2.6
2008-02-02 Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/usb-2.6
2008-02-01 Linus TorvaldsMerge git://git./linux/kernel/git/bart/ide-2.6
2008-02-01 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-02-01 Linus TorvaldsMerge branch 'audit.b46' of git://git./linux/kernel...
2008-02-01 Linus TorvaldsMerge git://git./linux/kernel/git/x86/linux-2.6-x86
2008-02-01 Linus TorvaldsMerge git://git./linux/kernel/git/mingo/linux-2.6-sched
2008-02-01 Thomas Gleixnerfutex: Add bitset conditional wait/wakeup functionality
2008-02-01 Linus TorvaldsMerge branch 'task_killable' of git://git./linux/kernel...
2008-01-31 Paul MackerrasMerge branch 'linux-2.6'
2008-01-28 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2008-01-27 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-01-26 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-01-26 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-01-26 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-01-26 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-01-25 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-25 Linus TorvaldsMerge git://git./linux/kernel/git/mchehab/v4l-dvb
2008-01-25 Linus TorvaldsMerge git://git./linux/kernel/git/bart/ide-2.6
2008-01-25 Linus TorvaldsMerge git://git./linux/kernel/git/mingo/linux-2.6-sched
2008-01-25 Alexey Dobriyansched, futex: detach sched.h and futex.h
2008-01-17 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-01-14 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-12-10 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2007-11-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-11-20 Len BrownPull thinkpad-2.6.24 into release branch
2007-11-20 Len BrownPull cpuidle into release branch
2007-11-17 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-11-13 Paul MackerrasMerge branch 'for-2.6.24' of /linux/kernel/git/galak...
2007-11-12 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2007-11-09 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2007-11-09 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2007-11-09 Paul MundtMerge /pub/scm/linux/kernel/git/lethal/sh64-2.6
2007-11-06 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-11-06 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-11-05 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2007-11-05 Linus TorvaldsMerge git://git./linux/kernel/git/sam/fix-kbuild
2007-11-05 Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2007-11-05 Linus TorvaldsMerge branch 'master' of git://git./linux/kernel/git...
2007-11-05 Adrian Bunkkernel/futex.c: make 3 functions static
2007-07-22 Len BrownPull osi into release branch
2007-07-22 Len BrownPull video into release branch
2007-07-22 Len BrownPull throttle into release branch
2007-07-22 Len BrownPull misc into release branch
2007-07-22 Len BrownPull dock-bay into release branch
2007-07-22 Len BrownPull bugzilla-7880 into release branch
2007-07-22 Len BrownPull battery into release branch
2007-07-22 Len BrownPull acpi-debug into release branch
2007-07-17 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2007-07-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2007-07-15 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-07-12 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-07-11 Paul MackerrasMerge branch 'for-2.6.23' into merge
2007-07-09 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-07-05 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-06-26 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2007-06-23 Len BrownPull now into release branch
next