diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-21 00:01:51 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-21 00:01:51 -0800 |
| commit | 2054271bb008de0bcf0bdc5d6041613f616420f2 (patch) | |
| tree | 24e638944597399d28c0432a5f6a323d3181c8a6 /arch/arm/include/asm/memory.h | |
| parent | 12480c2e53d355223cf6884ed1f56e6ac9b7c21f (diff) | |
| parent | 8757e168190a6ed2cd4aa23fc59bf86b0091b596 (diff) | |
| download | talos-op-linux-2054271bb008de0bcf0bdc5d6041613f616420f2.tar.gz talos-op-linux-2054271bb008de0bcf0bdc5d6041613f616420f2.zip | |
Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non-critical
From Haojian Zhuang:
* 'armsoc/fix' of git://github.com/hzhuang1/linux:
ARM: pxa: fix pxa25x gpio wakeup setting
+ Linux 3.7-rc6
Diffstat (limited to 'arch/arm/include/asm/memory.h')
0 files changed, 0 insertions, 0 deletions
