| commit | a377d181e65241344dd95aa4a42c477477be03f1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 17 08:08:57 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Dec 17 08:08:57 2009 -0800 |
| tree | bb624d0d33a95c9894899a22ea3d896ede66ce1e | |
| parent | 22a80593598736e33080c6877be6ae99ec091e02 [diff] | |
| parent | ef8355c3a3c7a4d7f1d49881937337ea78ed306a [diff] |
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