[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[linux-2.6] / net / compat.c
2006-12-12  Dave JonesMerge ../linus
2006-11-30  Wim Van SebroeckMerge ../linux-2.6-watchdog-mm
2006-11-22  James BottomleyMerge ../scsi-rc-fixes-2.6
2006-11-05  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-10-26  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2006-10-23  Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-watchdog
2006-10-22  David WoodhouseMerge git://git.infradead.org/~dwmw2/cafe-2.6
2006-10-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-10-21  Jeff GarzikMerge tag 'jg-20061012-00' of git://electric-eye.fr...
2006-10-21  David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-10-20  Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2006-10-17  Linus TorvaldsMerge git://git./linux/kernel/git/dtor/input
2006-10-13  Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-fixes
2006-10-13  Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2006-10-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2006-10-12  Linus TorvaldsMerge branch 'for-linus' of git://brick.kernel.dk/data...
2006-10-12  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-10-12  Miklos Szeredi[NET]: File descriptor loss while receiving SCM_RIGHTS
2006-06-16  Len BrownPull bugzilla-5737 into release branch
2006-06-16  Len BrownPull acpi_bus_register_driver into release branch
2006-06-15  Len BrownPull bugzilla-5452 into release branch
2006-06-15  Len BrownPull bugzilla-5653 into release branch
2006-06-15  Len BrownPull trivial into release branch
2006-06-15  Len BrownPull novell-bugzilla-156426 into release branch
2006-06-15  Len BrownPull trivial1 into release branch
2006-06-15  Len BrownPull pnpacpi into release branch
2006-06-15  Len BrownPull motherboard into release branch
2006-06-15  Len BrownPull Kconfig into release branch
2006-06-15  Len BrownPull ec into release branch
2006-06-15  Len BrownPull cpu-hotplug into release branch
2006-06-15  Len BrownPull address_range into release branch
2006-06-15  Len BrownPull acpica into release branch
2006-04-29  Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-04-18  Dave JonesMerge ../linus
2006-04-12  Jeff GarzikMerge branch 'master'
2006-04-12  Jeff GarzikMerge branch 'upstream'
2006-04-04  Kumar GalaMerge branch 'master'
2006-04-04  Jeff GarzikMerge branch 'upstream'
2006-04-04  Jeff GarzikMerge branch 'master'
2006-04-03  Steven WhitehouseMerge branch 'master'
2006-04-02  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-04-02  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-04-02  Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/perex/alsa
2006-04-02  Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2006-04-02  Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
2006-04-02  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/paulus/powerpc
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2006-04-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-04-02  Dmitry TorokhovManual merge with Linus.
2006-04-01  Dmitry Mishin[NETFILTER]: iptables 32bit compat layer
2006-03-31  Steven WhitehouseMerge branch 'master'
2006-03-31  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-03-30  Linus TorvaldsMerge branch 'drm-patches' of git://git./linux/kernel...
2006-03-30  Jeff GarzikMerge branch 'upstream'
2006-03-30  Jeff GarzikMerge branch 'mv-merge'
2006-03-28  Russell KingMerge nommu tree
2006-03-25  Russell KingMerge nommu tree
2006-03-25  Linus TorvaldsMerge branch 'audit.b3' of git://git./linux/kernel...
2006-03-25  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2006-03-25  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-03-25  Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2006-03-24  Jeff GarzikMerge branch 'upstream'
2006-03-24  Trond MyklebustMerge branch 'linus'
2006-03-23  Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2006-03-23  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2006-03-23  Anton AltaparmakovMerge branch 'master' of /home/aia21/ntfs-2.6/
2006-03-23  Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc
2006-03-23  Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-03-23  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-03-23  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-03-23  Jeff GarzikMerge branch 'master'
2006-03-22  Linus TorvaldsMerge git://git./linux/kernel/git/perex/alsa
2006-03-22  Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2006-03-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2006-03-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-03-22  Jaroslav KyselaMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-03-22  Shaun Pereira[NET]: socket timestamp 32 bit handler for 64 bit kernel
2006-03-22  Nathan ScottMerge HEAD from ../linux-2.6
2006-03-21  Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-03-21  Jeff GarzikMerge branch 'e1000-fixes' of git://198.78.49.142/...
2006-03-21  James BottomleyMerge ../linux-2.6
2006-03-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/herbert/crypto-2.6
2006-03-21  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-03-21  Dmitry Mishin[NET]: {get|set}sockopt compatibility layer
2005-11-06  Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-10-28  Tony LuckPull xpc-disengage into release branch
2005-10-28  Tony LuckPull new-efi-memmap into release branch
2005-10-28  Tony LuckPull altix-mmr into release branch
2005-10-28  Tony LuckPull altix-fpga-reset into release branch
2005-10-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-old
2005-10-21  Steve FrenchMerge ... /linux/kernel/git/sfrench/cifs-2.6.git/
2005-09-25  Dave Airlieupdate from upstream
2005-09-14  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-14  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-14  Jeff GarzikMerge /spare/repo/linux-2.6/
next