]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b07019f 9f29333)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Mon, 1 May 2006 15:24:37 +0000 (16:24 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Mon, 1 May 2006 15:24:37 +0000 (16:24 +0100)
Reverting c7afb48eb5147be9eb9789b4161462d246451ac2 since a better (but
more intrusive) fix is now merged upstream.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Trivial merge
Linux 2.6 source tree