From: Linus Torvalds Date: Mon, 24 May 2010 14:57:41 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd X-Git-Tag: v2.6.35-rc1~415 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=0163916f1db7f345963dad1af78b7628c759c6ee Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd * 'for-linus' of git://git.open-osd.org/linux-open-osd: exofs: confusion between kmap() and kmap_atomic() api exofs: Add default address_space_operations --- 0163916f1db7f345963dad1af78b7628c759c6ee