diff options
author | Ben Hutchings <benh@debian.org> | 2009-11-17 01:18:56 +0000 |
---|---|---|
committer | Ben Hutchings <benh@debian.org> | 2009-11-17 01:18:56 +0000 |
commit | b5751450976d0524809e242869b65b0623e1477d (patch) | |
tree | 612b71615c6095378eb255fe0f8dba13aa6363d9 /debian/config/i386/defines | |
parent | 81f4cd41e57a2e0ef71bc8f6af573833f2919c87 (diff) | |
parent | aac015e39f5d35e9a9d905f93935274c77e5fff2 (diff) | |
download | kernel_replicant_linux-b5751450976d0524809e242869b65b0623e1477d.tar.gz kernel_replicant_linux-b5751450976d0524809e242869b65b0623e1477d.tar.bz2 kernel_replicant_linux-b5751450976d0524809e242869b65b0623e1477d.zip |
Merge /dists/sid/linux-2.6.
This should include all changes up to 2.6.31-2, except patches merged upstream.
Fix up ARM patches to apply to 2.6.32.
svn path=/dists/trunk/linux-2.6/; revision=14642
Diffstat (limited to 'debian/config/i386/defines')
-rw-r--r-- | debian/config/i386/defines | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/config/i386/defines b/debian/config/i386/defines index 18fc0ebcfb0f..367df2eafa48 100644 --- a/debian/config/i386/defines +++ b/debian/config/i386/defines @@ -25,7 +25,7 @@ configs: [686_description] hardware: modern PCs -hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core or Atom; AMD K6, Athlon (K7), Duron, Opteron, Sempron, Turion or Phenom; Transmeta Efficeon; VIA C3 "Nehemiah" or C7 processors +hardware-long: PCs with Intel Pentium Pro/II/III/4/4M/D/M, Xeon, Celeron, Core or Atom; AMD K6, Geode LX/NX, Athlon (K7), Duron, Opteron, Sempron, Turion or Phenom; Transmeta Efficeon; VIA C3 "Nehemiah" or C7 processors [686_image] configs: |