From: Linus Torvalds 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-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a90fcf311199b0199e94e78fca899abf2aeb852b;p=linux-beck.git 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