diff options
| author | Len Brown <len.brown@intel.com> | 2013-02-18 05:25:53 (GMT) |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2013-02-18 05:25:53 (GMT) |
| commit | ca62cf59ceef10ff2ebca0e7f764507186870270 (patch) | |
| tree | 480ebfd5551db27052f501917a7e0314043c6778 /arch/arm | |
| parent | 2e7d0f60d8b976c951621c1bc82acf0654089c0b (diff) | |
| parent | 27be457000211a6903968dfce06d5f73f051a217 (diff) | |
| download | linux-fsl-qoriq-ca62cf59ceef10ff2ebca0e7f764507186870270.tar.xz | |
Merge branch 'misc' into release
Conflicts:
arch/x86/kernel/process.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/arm')
0 files changed, 0 insertions, 0 deletions