| commit | 5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Jan 03 20:27:45 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Jan 03 20:27:45 2012 +0000 |
| tree | c60bdca0529cbd44d32b3918b78d14e182ef57cd | |
| parent | 3b0d597139efddfd8960b44249b4a4c977d172f1 [diff] | |
| parent | 5f0a6e2d503896062f641639dacfe5055c2f593b [diff] |
Merge branch 'v3.2-rc7' into next/pm Conflicts: arch/arm/kernel/setup.c arch/arm/mach-shmobile/board-kota2.c