Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 9 Nov 2007 23:08:37 +0000 (15:08 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 9 Nov 2007 23:08:37 +0000 (15:08 -0800)
commita90fcf311199b0199e94e78fca899abf2aeb852b
tree0b916c9f11006d4452eefa2013a4c63a9ed4d43f
parentc5b875e354a54e2b5ba24eecae69bf94e025edd5
parent6f78a19702574008bbd333237380fa85be1c9e5d
Merge branch 'master' of /linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Use "is_power_of_2" macro for simplicity.
  [SPARC]: Remove duplicate includes.