Merge branch 'master' into for-next

*.gz

*.bz2

*.lzma

*.lzo

*.patch

*.gcno

filesystems/dnotify_test

laptops/dslm

timers/hpet_example

vm/hugepage-mmap

vm/hugepage-shm

vm/map_hugetlb

What:		/sys/class/power/ds2760-battery.*/charge_now

Date:		May 2010

KernelVersion:	2.6.35

Contact:	Daniel Mack <daniel@caiaq.de>

Description:

		This file is writeable and can be used to set the current

		coloumb counter value inside the battery monitor chip. This

		is needed for unavoidable corrections of aging batteries.

		A userspace daemon can monitor the battery charging logic

		and once the counter drops out of considerable bounds, take

		appropriate action.

What:		/sys/class/power/ds2760-battery.*/charge_full

Date:		May 2010

KernelVersion:	2.6.35

Contact:	Daniel Mack <daniel@caiaq.de>

Description:

		This file is writeable and can be used to set the assumed

		battery 'full level'. As batteries age, this value has to be

		amended over time.

What:		/sys/devices/system/node/nodeX/compact

Date:		February 2010

Contact:	Mel Gorman <mel@csn.ul.ie>

Description:

		When this file is written to, all memory within that node

		will be compacted. When it completes, memory will be freed

		into blocks which have as many contiguous pages as possible

What:		/sys/firmware/sfi/tables/

Date:		May 2010

Contact:	Len Brown <lenb@kernel.org>

Description:

		SFI defines a number of small static memory tables

		so the kernel can get platform information from firmware.

		The tables are defined in the latest SFI specification:

		http://simplefirmware.org/documentation

		While the tables are used by the kernel, user-space

		can observe them this way:

		# cd /sys/firmware/sfi/tables

		# cat $TABLENAME > $TABLENAME.bin