Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 19:19:30 +0000 (12:19 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 19:19:30 +0000 (12:19 -0700)
commit3720bd8b1e16b41b9ec640bf91f12e1a1b5cb961
treefecdaa69be5fc1f934909b89a6e3ae2c79241dfe
parenta61caa8523a76e497f6b2a05350c892bc5ee402c
parent6a8b4d319c52f8a3fdca46b185d001fbf0939911
Merge /pub/scm/linux/kernel/git/tglx/mtd-2.6