git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c15895e 0cfd810)
Merge branch 'master' into for-upstream
authorDavid Vrabel <david.vrabel@csr.com>
Mon, 20 Oct 2008 15:07:19 +0000 (16:07 +0100)
committerDavid Vrabel <david.vrabel@csr.com>
Mon, 20 Oct 2008 15:07:19 +0000 (16:07 +0100)
Conflicts:

Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile


Trivial merge
Pandora Kernel Repository