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)
* '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.


Trivial merge