+ "network speed tweak" - https://github.com/ch33kybutt/i5700-kernel/commit/6a9403f22f87f602fe521cb34d55d9b862336c30 [do not merge]
+ "Optimise apply_slack() for size and speed." - http://lkml.indiana.edu/hypermail/linux/kernel/1201.3/03172.html

To apply proper slack, the original algorithm used to prepare a mask and
then apply the mask to obtain the appropriately rounded-off absolute
time the timer expires.

This patch modifies the masking logic to a bit-shift logic, therby
reducing the complexity and number of operations. Thus obtaining a minor
speed-up.
+ "ipv4: save cpu cycles from check_leaf()" (copy&past from Linux 3.8)
Added Battery Friend option

Conflicts:
	arch/arm/configs/mapphone_OCE_defconfig
	arch/arm/mach-omap2/omap2plus-cpufreq.c
Move battery-friend to the misc devices

Conflicts:
	drivers/misc/Kconfig
	drivers/misc/Makefile
Fixing Battery Friend
Fix battery frined typo
Extend Battery Friend

When enabled it will set MPU OC to 100 which turns it off.
Battery Friend clean up and fix
CPUFREQ: Fix a typo
CPUFREQ: FInally fixed that thing..
Fix gpu value for batterty friend

Conflicts:
	changelog/Changelog_Nightly_2013-07-27
Battery friend - fix early_suspend
Battery Friend: Some fixes and new functions
Battery Friend: Forgot sth..
Battery Friend: Disable by default
hrtimer: Prevent enqueue of hrtimer on dead CPU
 hrtimer: Don't reinitialize a cpu_base's lock on CPU_UP
hrtimer: Consider preemption when migrating hrtimer cpu_bases
ext4: use atomic64_t for the per-flexbg free_clusters count

commit 90ba983f6889e65a3b506b30dc606aa9d1d46cd2 upstream.

A user who was using a 8TB+ file system and with a very large flexbg
size (> 65536) could cause the atomic_t used in the struct flex_groups
to overflow.  This was detected by PaX security patchset:

http://forums.grsecurity.net/viewtopic.php?f=3&t=3289&p=12551#p12551

This bug was introduced in commit 9f24e4208f7e, so it's been around
since 2.6.30.  :-(

Fix this by using an atomic64_t for struct orlav_stats's
free_clusters.

[Backported for 3.0-stable. Renamed free_clusters back to free_blocks;
fixed a few more atomic_read's of free_blocks left in 3.0.]

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Signed-off-by: Lingzhu Xiang <lxiang@redhat.com>
Reviewed-by: CAI Qian <caiqian@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>