| commit | ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:15:02 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Mon Oct 01 14:15:02 2012 -0700 |
| tree | 3ca115b6580b70b20d21da179f004b14f54edc8e | |
| parent | 17a505edb09495510ac8998450980472c412455b [diff] | |
| parent | 9cf1c871526cf6bfec2a653e1e068ee72592542c [diff] |
Merge branch 'next/cleanup' into HEAD Conflicts: drivers/staging/tidspbridge/core/wdt.c drivers/usb/host/Kconfig drivers/w1/masters/omap_hdq.c