[kernel] r5602 - dists/trunk/linux-2.6/debian/patches

[Martin Michlmayr]

Author: tbm
Date: Thu Jan 26 15:49:59 2006
New Revision: 5602

Modified:
   dists/trunk/linux-2.6/debian/patches/arm-fix-dc21285.patch
   dists/trunk/linux-2.6/debian/patches/arm-memory-h-page-shift.patch
Log:
update status of some patches


Modified: dists/trunk/linux-2.6/debian/patches/arm-fix-dc21285.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/arm-fix-dc21285.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/arm-fix-dc21285.patch	Thu Jan 26 15:49:59 2006
@@ -1,6 +1,7 @@
 ## DP: Fix compilation errors in dc21285.c
 ## DP: Patch author: Martin Michlmayr <tbm at cyrius.com>
-## DP: Upstream status: Submitted
+## DP: Upstream status: Submitted, see
+##     http://lists.infradead.org/pipermail/linux-mtd/2006-January/014709.html
 #
 
 --- old/drivers/mtd/maps/dc21285.c~	2006-01-10 19:40:53.000000000 +0000

Modified: dists/trunk/linux-2.6/debian/patches/arm-memory-h-page-shift.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/arm-memory-h-page-shift.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/arm-memory-h-page-shift.patch	Thu Jan 26 15:49:59 2006
@@ -1,6 +1,11 @@
 ## DP: Fix error "PAGE_SHIFT undeclared"
 ## DP: Patch author: Rod Whitby <rod at whitby.id.au>
-## DP: Upstream status: in ARM tree
+## DP: Upstream status: in ARM tree, in 2.6.16rc1
+# commit 313cbb5519405966e3e65fca86c0305ab24f2a3b
+# tree 949bb8daf7a32d5921cabe9d129df1d6342d40da
+# parent 8d27e6992bc6a7ca7eaa1d29fb1a8d6cb6022c45
+# author Rod Whitby <rod at whitby.id.au> Wed, 04 Jan 2006 17:17:13 +0000
+# committer Russell King <rmk+kernel at arm.linux.org.uk> Wed, 04 Jan 2006 17:17:13 +0000
 #
 
 http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=3218/1