Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 13 Nov 2005 20:30:14 +0000 (12:30 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 13 Nov 2005 20:30:14 +0000 (12:30 -0800)
commit41866a56cc4e676240b94ed8eaeca375aaef7496
treec389af72c041d4f105654ed28aacc6e582cb79e5
parentf3a9388e4ebea57583272007311fffa26ebbb305
parent5b9d1f19a7d6f13a97ac3eea9a1caea011ebd0ae
Merge /pub/scm/linux/kernel/git/tglx/mtd-2.6