CONFIG: ORIGEN: Enable SCHED_MC

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
regulator: Add {get/set}_voltage ops for dummy regulator

Required ops and constraints are added to the dummy regulator.

This also fixes following runtime messages.

s3c-sdhci s3c-sdhci.2: could not set regulator OCR (-22)

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Revert "mmc: use really long write timeout to deal with crappy cards"

This reverts commit 3bdc9ba892d6a294d16e9e6e0c4041926aa3d58c.

Write timeout of 3 sec causes this warning, which comes pretty
regularly.

mmc0: Too large timeout requested for CMD25!

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
drivers: i2c: s3c2410: Add DT related fixes for HDMIPHY controller

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
ARM: DTS: exynos4210-origen: Add combiner entry in device tree

Suggested-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
ARM: DTS: exynos4210-origen: Add wakeup interrupt entry in device tree

Suggested-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
ARM: DTS: exynos4210-origen: Add PMIC entry in device tree

Suggested-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
ARM: DTS: exynos4210-origen: Add LCD/FIMD entry in device tree

Suggested-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
ARM: EXYNOS: Add display support to EXYNOS4-DT

Suggested-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
UBUNTU: (no-up) fold down debian for ubuntu-q v3.3-rc1 rebase

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
UBUNTU: ubuntu: dm-raid4-5 -- (no-up) Export dm_disk function of device-mapper

This function is externally used by the dm-raid4-5 module.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Ben Collins <ben.collins@canonical.com>
UBUNTU: ubuntu: dm-raid45 -- version 2009.04.24 (2.6.30-rc3)

ExternalDriver: dm-raid45
Description: This software extends device-mapper by RAID4 and RAID5 mappings.
Url: http://people.redhat.com/~heinzm/sw/dm/dm-raid45/
Version: 2009.04.24 (2.6.30-rc3)

Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
UBUNTU: ubuntu: ndiswrapper -- version 1.55

ExternalDriver: ndiswrapper
Description: Windows network driver wrapper
Url: http://sourceforge.net/project/showfiles.php?group_id=93482
Version: 1.55

Update ndiswrapper to the latest version (v1.55) from sourceforge,
and renable.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: ubuntu: rfkill drivers -- version 1.3

Version: 1.3

Signed-off-by: Ben Collins <ben.collins@canonical.com>
UBUNTU: SAUCE: (no-up) Modularize vesafb

Signed-off-by: Ben Collins <ben.collins@canonical.com>
UBUNTU: SAUCE: (no-up) version: Implement version_signature proc file.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Tim Gardener <tim.gardner@canonical.com>
UBUNTU: SAUCE: (no-up) hostap: Change initial operation mode to managed (infra)

This was previously changed by using an "options" line in a modprobe.d
file, however that practice is now deprecated.  This is because module
names, option names, their values and even their current defaults can
all change inside the kernel and module-init-tools has never been kept
in sync.

In addition, changing the kernel means that the option change will apply
if the module is built in by users or the OEM team.

Signed-off-by: Scott James Remnant <scott@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
UBUNTU: SAUCE: (no-up) nbd: Change default partitions per device to 15

This was previously changed by using an "options" line in a modprobe.d
file, however that practice is now deprecated.  This is because module
names, option names, their values and even their current defaults can
all change inside the kernel and module-init-tools has never been kept
in sync.

In addition, changing the kernel means that the option change will apply
if the module is built in by users or the OEM team.

Bug: #342563

Signed-off-by: Scott James Remnant <scott@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
UBUNTU: SAUCE: hotkey quirks for various Zeptro Znote and Fujitsu Amilo laptops

OriginalAuthor: Marius Wenderoth <scale87>
Bug: #330259

Add model specific quirks for the hotkeys for the laptops below:

	Zepto Znote 6615WD
	Zepto Znote 6625WD
	FUJITSU SIEMENS AMILO Xi 2428

In each case the volume keys and the mute key do not correctly produce
key release events.  Quirk these to force a key release. (Patch modified
to compile with 2.6.30)

[apw@canonical.com: Track the consolidation of release quirks in the
commit below:

    commit 000c2a35b8b0485f5a872c24c4f2d0d6579951c1
    Author: Herton Ronaldo Krzesinski <herton@mandriva.com.br>
    Date:   Fri Oct 16 16:13:59 2009 -0700

	Input: atkbd - consolidate force release quirks for volume keys
]

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
UBUNTU: SAUCE: (no-up) Sony laptop: Some Sony Vaia laptops do not enable wwan power by default.

Bug: https://bugs.launchpad.net/bugs/364678

Added quirk to enable wwan power based on DMI information already present in the module.
Ity appears that Vaio's do not enable power to wwan from a cold boot.

We'll carry this patch indefinitely.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>