[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
[pandora-kernel.git] / drivers / s390 / char / defkeymap.c
2007-02-11 Dave Jones[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
2007-02-09 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-08 David S. MillerMerge branch 'HEAD' of /linux/kernel/git/herbert/crypto-2.6
2007-02-08 Linus TorvaldsMerge /pub/scm/linux/kernel/git/paulus/powerpc
2007-02-08 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-02-07 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-07 Linus TorvaldsMerge git://git./linux/kernel/git/steve/gfs2-2.6-nmw
2007-02-07 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2007-02-06 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2007-02-06 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/jikos/hid
2007-02-06 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2007-02-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-06 Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2007-02-05 Heiko Carstens[S390] Get rid of a lot of sparse warnings.
2006-09-30 Linus TorvaldsMerge branch 'intelfb-patches' of /linux/kernel/git...
2006-09-26 Tony LuckPull esi-support into release branch
2006-09-26 Tony LuckPull model-name into release branch
2006-09-19 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-09-17 Stefan Richterieee1394: merge from Linus
2006-08-30 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-08-21 Len BrownMerge trivial low-risk suspend hotkey bugzilla-5918...
2006-08-05 Dmitry TorokhovMerge /linux/kernel/git/torvalds/linux-2.6 into for...
2006-08-01 Paul MackerrasMerge branch 'merge'
2006-07-27 John W. LinvilleMerge branch 'from-linus' into upstream
2006-07-21 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2006-07-19 Jeff GarzikMerge branch 'upstream' of git://git./linux/kernel...
2006-07-17 Jeff GarzikMerge branch 'upstream-fixes-jgarzik' of git://lost...
2006-07-17 Steven WhitehouseMerge branch 'master'
2006-07-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-07-13 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2006-07-13 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-07-13 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-07-12 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-07-12 Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2006-07-12 Heiko Carstens[S390] Fix sparse warnings.
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2