Merge remote branch 'kernelorg/linux-3.0.y' into patch-deepidle
check irq mask condition
Add more overclock freq

Added more freq for overclock ( 1320 taken from Steve Garon )
Changed to make easy to add/remove one feq. in code

Conflicts:

	arch/arm/mach-s5pv210/cpufreq.c
	arch/arm/mach-s5pv210/mach-herring.c
give more ram to userspace:

requires "SsbSipMfcApi.h" change in crespo device tree

#define  S5PV210_VIDEO_SAMSUNG_MEMSIZE_MFC0 (36864 * SZ_1K)
#define  S5PV210_VIDEO_SAMSUNG_MEMSIZE_MFC1 (36864 * SZ_1K)
to
#define  S5PV210_VIDEO_SAMSUNG_MEMSIZE_MFC0 (11264 * SZ_1K)
#define  S5PV210_VIDEO_SAMSUNG_MEMSIZE_MFC1 (11264 * SZ_1K)
add defconfig and modules script
use arch/arm/configs/carz_crespo_defconfig
add fs modules
Change battery percentage calculation.

Compensate for chipset inaccuracies in returning battery percentage
the way Samsung did it in its Froyo rom. This allows the battery to
reach 100% (may require bump charging) and no visible battery drop
is noticable (even after a reboot). The precision is also increased
(no 2% jump) from the current method of calculation because the
calculation is done where we have extra precision information from
the chipset.

added this pawitp implementation to joing more kernel work on CM devices.

Change-Id: Id7f15dd3906f7a12949683c0d921ce7a8498e70a

Conflicts:

	drivers/power/s5pc110_battery.c
Add compress xz possiblity for this kernel

That will reduce size and will speed up loading
Merge commit 'v3.0.24' into patch-deepidle
Merge commit 'v3.0.25' into patch-deepidle
Merge commit 'v3.0.26' into patch-deepidle
add xzkernel to ignore list
Merge branch 'android-samsung-3.0-ics-mr1' into patch-deepidle

Conflicts:
	fs/proc/base.c
USB: option: Add MediaTek MT6276M modem&app interfaces

commit 0d8520a1d7f43328bc7085d4244d93c595064157 upstream.

Add MEDIATEK products to Option driver

Signed-off-by: Meng Zhang <meng.zhang@mediatek.com>
Signed-off-by: Matthias Urlichs <matthias@urlichs.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
USB: option driver: adding support for Telit CC864-SINGLE, CC864-DUAL and DE910-DUAL modems

commit 7204cf584836c24b4b06e4ad4a8e6bb8ea84908e upstream.

Adding PID for Telit CC864-SINGLE, CC864-DUAL and DE910-DUAL
modems

Signed-off-by: Daniele Palmas <dnlplm@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
USB: option: make interface blacklist work again

commit 963940cf472d76eca2d36296e461202cc6997352 upstream.

commit 0d905fd "USB: option: convert Huawei K3765, K4505, K4605
reservered interface to blacklist" accidentally ANDed two
blacklist tests by leaving out a return.  This was not noticed
because the two consecutive bracketless if statements made it
syntactically correct.

Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
USB: option: add ZTE MF820D

commit 5889d3d4209c1050b4a3c96c41faf6c0976a4acf upstream.

This device presents a total of 5 interfaces with ff/ff/ff
class/subclass/protocol. The last one of these is verified
to be a QMI/wwan combined interface which should be handled
by the qmi_wwan driver, so we blacklist it here.

Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
USB: ftdi_sio: fix problem when the manufacture is a NULL string

commit 656d2b3964a9d0f9864d472f8dfa2dd7dd42e6c0 upstream.

On some misconfigured ftdi_sio devices, if the manufacturer string is
NULL, the kernel will oops when the device is plugged in.  This patch
fixes the problem.

Reported-by: Wojciech M Zabolotny <W.Zabolotny@elka.pw.edu.pl>
Tested-by: Wojciech M Zabolotny <W.Zabolotny@elka.pw.edu.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
USB: ftdi_sio: add support for BeagleBone rev A5+

commit 444aa7fa9bd752d19ce472d3e02558b987c3cc67 upstream.

BeagleBone changed to the default FTDI 0403:6010 id in rev A5 to make life
easier for Windows users, so we need a similar workaround as the Calao
board to support it.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>