git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfdc58b 1ab9dd0)
Merge mulgrave-w:git/linux-2.6
authorJames Bottomley <jejb@sparkweed.localdomain>
Sun, 24 Sep 2006 02:03:52 +0000 (21:03 -0500)
committerJames Bottomley <jejb@sparkweed.localdomain>
Sun, 24 Sep 2006 02:03:52 +0000 (21:03 -0500)
Conflicts:

include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.


Trivial merge
Pandora Kernel Repository