| commit | 155e384bce596216287eb38fb616af016c256c35 | [log] [tgz] |
|---|---|---|
| author | Wu Zhangjin <wuzhangjin@gmail.com> | Thu Jul 08 01:27:09 2010 +0800 |
| committer | Wu Zhangjin <wuzhangjin@gmail.com> | Thu Jul 08 01:27:09 2010 +0800 |
| tree | 6aead26857df377b4360299b5af4418ef1a35cef | |
| parent | 6ea21573a7179379928c02028477a3f2edd71323 [diff] | |
| parent | cd9d51a7c1d2923573f1b4c4707707825bbdb57f [diff] |
Merge branch 'linux-2.6.31-stable' of git://www.linux-mips.org/pub/scm/linux into linux-loongson-2.6.31 Conflicts: arch/mips/Kconfig Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>