diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 17:24:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 17:24:49 -0400 |
| commit | 303fd2c2ce5addef1aacac962a5b099cc0af71ea (patch) | |
| tree | a20d906caec25a068742d6d9998baf79e5c72677 /net/dns_resolver/internal.h | |
| 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
Diffstat (limited to 'net/dns_resolver/internal.h')
0 files changed, 0 insertions, 0 deletions