From: Linus Torvalds Date: Thu, 17 Dec 2009 16:08:57 +0000 (-0800) Subject: Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a377d181e65241344dd95aa4a42c477477be03f1;p=linux-beck.git Merge branch 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score * 'for-linus' of git://gitserver.sunplusct.com/linux-2.6-score: score: include asm-generic/param.h in asm/delay.h. score: fixed pfn_valid define. score: add flush_dcahce_page and PG_dcache_dirty define --- a377d181e65241344dd95aa4a42c477477be03f1