Merge branch 'fixes-2.6.39' into for-2.6.40

This commit is contained in:
Tejun Heo 2011-05-24 09:59:36 +02:00
commit 6988f20fe0
830 changed files with 33294 additions and 15847 deletions

View file

@ -544,7 +544,7 @@ void __init mem_init(void)
unsigned long *empty_zero_page __read_mostly;
EXPORT_SYMBOL(empty_zero_page);
void show_mem(void)
void show_mem(unsigned int filter)
{
int i,free = 0,total = 0,reserved = 0;
int shared = 0, cached = 0;