git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 17a505e 9cf1c87)
Merge branch 'next/cleanup' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:15:02 +0000 (14:15 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:15:02 +0000 (14:15 -0700)
Conflicts:
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/w1/masters/omap_hdq.c


Trivial merge
Pandora Kernel Repository