| commit | 303fd2c2ce5addef1aacac962a5b099cc0af71ea | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 28 14:24:49 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 28 14:24:49 2010 -0700 |
| tree | a20d906caec25a068742d6d9998baf79e5c72677 | |
| parent | 6b3a7c0f8a030561cb4eb5e905149938575e8085 [diff] | |
| parent | 9e5610a99535723e83b7ddd02f0fd3fe36c86649 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: Blackfin: bf52x/bf54x boards: drop unused nand page size Blackfin: punt duplicate SPORT MMR defines