325efe382f
Fix upstream build breakage in Documentation/DocBook/videobook.xml
...
DOCPROC Documentation/DocBook/videobook.xml
docproc: /tmp/buildd/linux-2.6-2.6.27~rc2/debian/build/source/drivers/media/video/videodev.c: No such file or directory
make[5]: *** [Documentation/DocBook/videobook.xml] Error 1
Fixed by importing upstream changeset:
commit 3a35c27ac68cea19c252e127ec61099648eb4870
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed Aug 6 10:08:56 2008 -0700
docbook: fix v4l fatal filename error
docproc: /var/linsrc/lin2627-rc2/drivers/media/video/videodev.c: No such file or directory
make[1]: *** [Documentation/DocBook/videobook.xml] Error 1
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
cc: mchehab@infradead.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
svn path=/dists/trunk/linux-2.6/; revision=12040
2008-08-12 07:22:33 +00:00
62c2b4e54c
fix MAC detection on QNAP TS-209 and TS-409
...
svn path=/dists/trunk/linux-2.6/; revision=11988
2008-08-09 15:15:42 +00:00
2c926b3f52
should be in rc3 but needed for now
...
svn path=/dists/trunk/linux-2.6/; revision=11975
2008-08-06 07:20:39 +00:00
51c96ef7bf
refresh arm patches
...
svn path=/dists/trunk/linux-2.6/; revision=11949
2008-08-03 06:23:30 +00:00
45c16ee1d0
remove from trunk since I'm sure this will go into 2.6.27 anyway
...
svn path=/dists/trunk/linux-2.6/; revision=11948
2008-08-03 06:15:09 +00:00
d3459c6c85
METH: fix MAC address setup.
...
svn path=/dists/trunk/linux-2.6/; revision=11946
2008-08-03 06:10:54 +00:00
e214848dff
remove patches that are in 2.6.27 rc1
...
svn path=/dists/trunk/linux-2.6/; revision=11934
2008-07-30 18:51:04 +00:00
7c71a0bdb5
nuke m68k patches
...
partialy applied and will come back later.
svn path=/dists/trunk/linux-2.6/; revision=11932
2008-07-30 16:55:15 +00:00
cccb37c877
nuke lenny backported features or bugfixes
...
svn path=/dists/trunk/linux-2.6/; revision=11929
2008-07-30 16:50:31 +00:00
79b994f030
m68k: update patches
...
svn path=/dists/trunk/linux-2.6/; revision=11917
2008-07-29 17:32:33 +00:00
320ba26f70
Fix console selection in PowerPC LPAR environment.
...
* debian/changelog: Update.
* debian/patches/bugfix/powerpc/lpar-console.patch: Add.
* debian/patches/series/1~experimental.1: Add new patch.
svn path=/dists/trunk/linux-2.6/; revision=11914
2008-07-28 19:20:10 +00:00
e0a032a2b9
xfs: pack some shortform dir2 structures for the ARM old ABI
...
architecture (closes : #414932 ).
svn path=/dists/trunk/linux-2.6/; revision=11912
2008-07-26 20:37:09 +00:00
9956b97b96
atl1d: fix !CONFIG_PM build
...
svn path=/dists/trunk/linux-2.6/; revision=11900
2008-07-24 01:02:02 +00:00
2da8978ba5
add input bugfix
...
svn path=/dists/trunk/linux-2.6/; revision=11892
2008-07-23 22:56:55 +00:00
b779dc6b34
backport two alsa hda fixes
...
concerns intel boards so presumed important enough
svn path=/dists/trunk/linux-2.6/; revision=11889
2008-07-23 22:22:58 +00:00
216f7e5748
Export symbol for MOL again.
...
* debian/changelog: Update.
* debian/patches/bugfix/powerpc/mm-mol.patch: Add.
* debian/patches/series/1~experimental.1: Add new patch.
svn path=/dists/trunk/linux-2.6/; revision=11886
2008-07-23 16:47:38 +00:00
9d669683f4
Fix a boot crash on the Kurobox Pro.
...
svn path=/dists/trunk/linux-2.6/; revision=11865
2008-07-21 08:51:57 +00:00
1f95057a5c
x86-acpi-sleep-x61s.patch add patch desc
...
svn path=/dists/trunk/linux-2.6/; revision=11851
2008-07-17 08:17:56 +00:00
ed8f523798
m68k: add missed patches
...
svn path=/dists/trunk/linux-2.6/; revision=11850
2008-07-16 22:14:17 +00:00
788ab8ffc2
add linux-m68k patches
...
svn path=/dists/trunk/linux-2.6/; revision=11848
2008-07-16 20:58:15 +00:00
9982860844
2.6.26 acpi sleep regression patch
...
fixes kernel #11064 , will probably ship soon in stable,
better have it already now to not scare users away.
svn path=/dists/trunk/linux-2.6/; revision=11847
2008-07-16 18:22:22 +00:00
90d6eaad0a
add a fix that didn't make it
...
svn path=/dists/trunk/linux-2.6/; revision=11834
2008-07-14 09:10:34 +00:00
5d03b9e7d5
remove mips patches that are in rc9
...
svn path=/dists/trunk/linux-2.6/; revision=11801
2008-07-06 11:00:09 +00:00
c15493bc30
sdhci fixes for olpc by dilinger landed upstream
...
nuke them
svn path=/dists/trunk/linux-2.6/; revision=11799
2008-07-06 09:50:26 +00:00
753608df16
* [mips] Fix logic bug in atomic_sub_if_positive.
...
svn path=/dists/trunk/linux-2.6/; revision=11752
2008-07-03 18:13:10 +00:00
446ee644db
ip32: Enable FAST-20 for onboard scsi
...
svn path=/dists/trunk/linux-2.6/; revision=11747
2008-07-03 10:16:01 +00:00
496e911cd6
add OLPC sdhci quirks
...
svn path=/dists/trunk/linux-2.6/; revision=11724
2008-06-29 09:56:58 +00:00
c5e92e5d94
gbefb: fix cmap FIFO timeout
...
svn path=/dists/trunk/linux-2.6/; revision=11707
2008-06-26 10:21:38 +00:00
712aed1f5b
add MIPS fixes from Thomas Bogendoerfer
...
svn path=/dists/trunk/linux-2.6/; revision=11700
2008-06-25 12:27:42 +00:00
2bbc9c33e3
update to 2.6.26-rc7
...
nuke git patch, no new conflicts
svn path=/dists/trunk/linux-2.6/; revision=11674
2008-06-21 08:05:25 +00:00
66ac296929
update to 2.6.26-rc6-git6
...
no new conflicts
svn path=/dists/trunk/linux-2.6/; revision=11662
2008-06-19 08:43:15 +00:00
4777988ed2
patches in git now - remove
...
svn path=/dists/trunk/linux-2.6/; revision=11653
2008-06-17 09:08:06 +00:00
c60026c6cc
update to 2.6.26-rc6-git1
...
no conflicts
svn path=/dists/trunk/linux-2.6/; revision=11630
2008-06-13 10:08:46 +00:00
edfd2e9b5d
update to 2.6.26-rc6
...
refresh conflicting dfsg computone patch, just mark the ip2 thing b0rked.
nuke git snapshot patch.
svn path=/dists/trunk/linux-2.6/; revision=11627
2008-06-13 09:45:51 +00:00
07a6ff34cd
update to 2.6.25-rc5-git3
...
no new conflicts
svn path=/dists/trunk/linux-2.6/; revision=11589
2008-06-09 22:07:04 +00:00
96460cb205
update to 2.6.25-rc5-git2
...
- disable conflicting mips patch, needs check
- remove conflicting ip2 Kconfig update
svn path=/dists/trunk/linux-2.6/; revision=11575
2008-06-07 23:09:28 +00:00
ec6d757afa
another mips build error *sigh*
...
svn path=/dists/trunk/linux-2.6/; revision=11526
2008-06-05 11:58:51 +00:00
308763f3e6
add some mips build fixes
...
svn path=/dists/trunk/linux-2.6/; revision=11525
2008-06-05 11:14:38 +00:00
16b24be5d5
update to 2.6.26-rc5
...
no new conflicts
svn path=/dists/trunk/linux-2.6/; revision=11522
2008-06-05 09:32:12 +00:00
0005b42e46
update to 2.6.26-rc4-git4
...
no new conflicts
svn path=/dists/trunk/linux-2.6/; revision=11506
2008-06-02 09:25:16 +00:00
1454646ddc
update to 2.6.26-rc4-git3
...
no new conflicts
svn path=/dists/trunk/linux-2.6/; revision=11498
2008-05-30 09:21:20 +00:00
e273f7c1a8
update to 2.6.26-rc4
...
no new conflicts, nuke git patch.
svn path=/dists/trunk/linux-2.6/; revision=11462
2008-05-26 21:32:51 +00:00
67d86c54f8
update to 2.6.26-rc3-git7
...
new ip2 cleanups, no other conflicts
svn path=/dists/trunk/linux-2.6/; revision=11451
2008-05-25 08:57:59 +00:00
05fb7b23d7
update to 2.6.26-rc3-git5
...
no new conflicts
svn path=/dists/trunk/linux-2.6/; revision=11447
2008-05-23 12:18:18 +00:00
5502b36682
update to 2.6.26-rc3-git3
...
conflicting patch in fore200e_mkfirm
disable powerpc serial hack patch that need refresh
svn path=/dists/trunk/linux-2.6/; revision=11432
2008-05-21 11:03:47 +00:00
5b4f1736a2
update patch
...
svn path=/dists/trunk/linux-2.6/; revision=11423
2008-05-19 19:08:12 +00:00
d2744d64ad
update to 2.6.26-rc3
...
nuke old git patch, no new conflicts.
svn path=/dists/trunk/linux-2.6/; revision=11421
2008-05-18 22:48:10 +00:00
570065e0ca
fixup arm patch Kconfig logic in trunk too.
...
svn path=/dists/trunk/linux-2.6/; revision=11392
2008-05-15 22:25:20 +00:00
fca703f298
update to 2.6.26-rc2-git4
...
great the atl1 patches have been merged, so nuke them.
comment a arm disable patch that conflicts with upstream dvb Kconfig fixes.
svn path=/dists/trunk/linux-2.6/; revision=11390
2008-05-15 10:10:41 +00:00
6f9805a507
update to 2.6.26-rc2-git2
...
nuke merged build fix, no further conflicts
svn path=/dists/trunk/linux-2.6/; revision=11387
2008-05-13 09:48:33 +00:00
Ian Campbell
Martin Michlmayr
Maximilian Attems
Stephen Marenka
Bastian Blank
Thiemo Seufer