first commit missed , jb2
upstream 64-93
config cleaned and turning for ram to cutting video ram & other
 lzo4 , video ram turning , sound ram decreased and ...
Forced Fast Charge v1.2a

 SysFS interface :

 * /sys/kernel/fast_charge/force_fast_charge (rw)
 *
 *   0 - disabled (default)
 *   1 - substitute AC to USB
 *   2 - use custom mA configured through sysfs interface (see below)
 *
 * /sys/kernel/fast_charge/ac_charge_level (rw)
 *
 *   rate at which to charge when on AC (1.0A to 1.5A)
 *
 * /sys/kernel/fast_charge/usb_charge_level (r/w)
 *
 *   rate at which to charge when on USB (0.475A to 1.0A)
 *
 * /sys/kernel/fast_charge/failsafe (rw)
 *
 *   0 - disabled - allow anything up to 2.1A to be used as AC / USB custom current
 *   1 - enabled  - behaviour as described above (default)
 *
 * /sys/kernel/fast_charge/version (ro)
 *
 *   display fast charge version information
Forced Fast Charge v1.2b

Restore compliance to Samsung JB code for normal AC charge

SysFS interface :

 * /sys/kernel/fast_charge/force_fast_charge (rw)
 *
 *   0 - disabled (default)
 *   1 - substitute AC to USB
 *   2 - use custom mA configured through sysfs interface (see below)
 *
 * /sys/kernel/fast_charge/ac_charge_level (rw)
 *
 *   rate at which to charge when on AC (1.0A to 1.5A)
 *
 * /sys/kernel/fast_charge/usb_charge_level (r/w)
 *
 *   rate at which to charge when on USB (0.475A to 1.0A)
 *
 * /sys/kernel/fast_charge/failsafe (rw)
 *
 *   0 - disabled - allow anything up to 2.1A to be used as AC / USB custom current
 *   1 - enabled  - behaviour as described above (default)
 *
 * /sys/kernel/fast_charge/version (ro)
 *
 *   display fast charge version information
 fastchg 1.4 and make ram 836mb git status
 fix cherry-pick error
Forced Fast Charge v1.4a

- return "invalid argument" when writing a wrong value in sysfs tunables

SysFS interface :

 * /sys/kernel/fast_charge/force_fast_charge (rw)
 *
 *   0 - disabled (default)
 *   1 - substitute AC to USB
 *   2 - use custom mA configured through sysfs interface (see below)
 *
 * /sys/kernel/fast_charge/ac_charge_level (rw)
 *
 *   rate at which to charge when on AC (1.0A to 1.5A)
 *
 * /sys/kernel/fast_charge/usb_charge_level (r/w)
 *
 *   rate at which to charge when on USB (0.475A to 1.0A)
 *
 * /sys/kernel/fast_charge/wireless_charge_level (r/w)
 *
 *   rate at which to charge when on wireless (0.475A to 1.0A)
 *
 * /sys/kernel/fast_charge/failsafe (rw)
 *
 *   0 - disabled - allow anything up to 2.1A to be used as AC / USB custom current
 *   1 - enabled  - behaviour as described above (default)
 *
 * /sys/kernel/fast_charge/version (ro)
 *
 *   display fast charge version information

Conflicts:
	include/linux/fastchg.h
[PATCH v4 2/3] zram: promote zram from staging
Date	Fri, 2 Nov 2012 16:12:46 +0900

It's time to promote zram from staging because zram lives in staging
for a long time and is improved by many contributors so code is
very clean. Most important issue, zram's dependency with x86 is
solved by making zsmalloc portable. In addition, many embedded
product uses zram in real practice so I think there is no reason
to prevent promotion now.

Cc: Seth Jennings <sjenning@linux.vnet.ibm.com>
Cc: Nitin Gupta <ngupta@vflare.org>
Acked-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Minchan Kim <minchan@kernel.org>

Note by Dorimanx:
The ZRAM driver is moved as is from one location to drivers/block/
no code changes.

Now i need to add support for new zsmalloc for zram.

Conflicts:
	arch/arm/configs/cyanogenmod_n7000_defconfig
	drivers/block/snappy/Kconfig
	drivers/block/snappy/Makefile
	drivers/block/snappy/csnappy.h
	drivers/block/snappy/csnappy_compress.c
	drivers/block/snappy/csnappy_decompress.c
	drivers/block/snappy/csnappy_internal.h
	drivers/staging/Kconfig
	drivers/staging/Makefile
 fix >>>HEAD
 Staging: zram/zram_sysfs.c: Fixed call of obsolete function strict_st.

.rtoX

As reported by checkpatch.pl strict_strtoX is obsolet and should be
replaced by kstrtoX.

Signed-off-by: Sergey Datsevich <srgdts@gmail.com>
Signed-off-by: Bjoern Meier <bjoernmeier@hotmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

commit 04e7bbad44c1a0c449719f90d507d13e015f1444 1 parent 6e8087a4fa
Sergey Datsevich authored a year ago gregkh committed a year ago

Conflicts:
	drivers/block/zram/zram_sysfs.c
 staging: zram: Rename module parameter

zram accepts number of devices to be created
as a module parameter. This was renamed from
num_devices to zram_num_devices (without updating
the documentation!) since num_devices was declared
as a non-static global variable, polluting the global
namespace. Now, we declare it as a static variable
and revert back the name change.

The documentation (zram.txt) already mentions
num_devices as the module parameter name.

Signed-off-by: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Conflicts:
	drivers/block/zram/zram_drv.c
	drivers/block/zram/zram_drv.h
	drivers/block/zram/zram_sysfs.c
Revert " fix >>>HEAD"

This reverts commit 002c7d565d0b282d4e0987fbf18b9bd053d73bcc.
Revert "[PATCH v4 2/3] zram: promote zram from staging"

This reverts commit 7224613edb00f94122fe12c56e49927ddd0dc707.
Revert " staging: zram: Rename module parameter"

This reverts commit e701c6cc2dd35e44c19b51fc0d2c42ef30bd1f96.
Revert " Staging: zram/zram_sysfs.c: Fixed call of obsolete function strict_st."

This reverts commit 441e666f5a3b4729fd273cb5be0079418e299f09.
Fix kernel build error

Change-Id: I1191517240ae7bcfb2fcbbffc98e22f28e8fa151
Merge remote-tracking branch 'origin/jb2' into jb3

Conflicts:
	Makefile
	arch/arm/configs/alcohol_defconfig
	arch/arm/mm/cache-l2x0.c