diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-09-22 12:11:21 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-09-22 12:11:21 +0900 |
| commit | 56952baa9b6f6bc06437abd51baefc4f7c8dee3b (patch) | |
| tree | da0ddfda65137a591a695a0648ee8160922f8eb6 /net/802 | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
| parent | 011527b45f8e3092e1f3192e5aea94187a6ca269 (diff) | |
| parent | fae9659a2cabcdaa01ea5a87568677e5cb037478 (diff) | |
Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new
Conflicts:
arch/arm/mach-exynos/mach-smdkv310.c