git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9805199 66efc5a)
Merge branch 'linus'
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>
Sat, 10 Feb 2007 19:45:43 +0000 (13:45 -0600)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Sat, 10 Feb 2007 19:45:43 +0000 (13:45 -0600)
Conflicts:

drivers/scsi/ipr.c

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Trivial merge
Pandora Kernel Repository