projects / platform / adaptation / renesas_rcar / renesas_kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f761b69 4184407)
Merge branch 'wl12xx-next' into for-linville
authorLuciano Coelho <coelho@ti.com>
Thu, 21 Jun 2012 14:31:46 +0000 (17:31 +0300)
committerLuciano Coelho <coelho@ti.com>
Thu, 21 Jun 2012 14:31:46 +0000 (17:31 +0300)
Conflicts:
drivers/net/wireless/ti/wl18xx/main.c


Trivial merge
Domain: System / Uncategorized;