diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-12-13 22:25:11 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-12-13 22:25:11 -0500 |
| commit | b1d76b202e451fcb8909b7686a6bc54127c2411a (patch) | |
| tree | e4f4db1cfe86e343f6e564692134dab0b3fa2a2d /arch/parisc/kernel/firmware.c | |
| parent | 48bc2b8c71781756d280f4837dbaa20dee64ec22 (diff) | |
| parent | a1346c99fc89f2b3d35c7d7e2e4aef8ea4124342 (diff) | |
Merge commit 'v2.6.36.2' into linaro-2.6.36
Conflicts:
arch/arm/mm/fault-armv.c
Diffstat (limited to 'arch/parisc/kernel/firmware.c')
0 files changed, 0 insertions, 0 deletions