| commit | 3800bd392ffc70cb699fbd06734ae9aabea97979 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sun Sep 02 08:21:25 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Sun Sep 02 08:21:25 2012 -0700 |
| tree | ff5350bb191d24d1247d32d5e8c955fa060672ad | |
| parent | aa9f6d6b1be17fb84cd62e19f8d997b378b1c852 [diff] | |
| parent | 4fd20570995c46b08711b062c69ab903319d6041 [diff] |
Merge branch 'fixes-for-v3.6-v2' of git://git.infradead.org/users/jcooper/linux into fixes * 'fixes-for-v3.6-v2' of git://git.infradead.org/users/jcooper/linux: ARM: Kirkwood: Fix 'SZ_1M' undeclared here for db88f6281-bp-setup.c