diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-04 16:54:54 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-04 16:54:54 +0200 |
| commit | 8ee41a62a3800b8450985d2970fd985421ad7043 (patch) | |
| tree | 971c4f8cdd3e5f6f93f46fbcddd37a736f706c78 /fs/proc | |
| parent | c911a3169ed81bbda023740b76457aa795a4f910 (diff) | |
| parent | f63870924f83ebb66b5eb8fb8dde83bf9be252cc (diff) | |
Merge branch 'prima2/pinctrl' into next/pinctrl
* prima2/pinctrl:
ARM: prima2: enable gpiolib unconditionally
Diffstat (limited to 'fs/proc')
0 files changed, 0 insertions, 0 deletions