git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6a0446 3b44f13)
Merge by hand (whitespace conflicts in libata.h)
authorJames Bottomley <jejb@titanic.(none)>
Thu, 10 Nov 2005 14:29:07 +0000 (08:29 -0600)
committerJames Bottomley <jejb@titanic.(none)>
Thu, 10 Nov 2005 14:29:07 +0000 (08:29 -0600)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Trivial merge
Pandora Kernel Repository