From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 6 Jan 2006 17:01:25 +0000 (-0800)
Subject: Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block
X-Git-Tag: v2.6.16-rc1~936^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d99cf9d679a520d67f81d805b7cb91c68e1847f0;p=pandora-kernel.git

Merge branch 'post-2.6.15' of git://brick.kernel.dk/data/git/linux-2.6-block

Manual fixup for merge with Jens' "Suspend support for libata", commit
ID 9b847548663ef1039dd49f0eb4463d001e596bc3.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

d99cf9d679a520d67f81d805b7cb91c68e1847f0
Reading git-diff-tree failed