From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 9 Nov 2007 23:08:37 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
X-Git-Tag: v2.6.24-rc3~178
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a90fcf311199b0199e94e78fca899abf2aeb852b;p=linux-2.6

Merge branch 'master' of master.kernel.org:/pub/scm/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.
---

a90fcf311199b0199e94e78fca899abf2aeb852b