Merge branch 'tracking-armlt-mmc' into integration-linux-vexpress
Merge branch 'tracking-armlt-misc-fixes' into integration-linux-vexpress
Merge branch 'tracking-armlt-arm-arch-fixes' into integration-linux-vexpress
Merge branch 'tracking-armlt-gator' into integration-linux-vexpress
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>
UBUNTU: SAUCE: (no-up) disable adding scsi headers to linux-libc-dev

Currently scsi headers are generated by the kernel and by libc6-dev.
We need to coordinate any switch over to the kernel.  Temporarily disabled
these headers in the kernel package.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: ubuntu: dm-raid-45 -- update to compile with 2.6.32

This commit changed bio_barrier() to direct flag accessors,
convert dm-raid-4-5 to match:

  commit 1f98a13f623e0ef666690a18c1250335fc6d7ef1
  Author: Jens Axboe <jens.axboe@oracle.com>
  Date:   Fri Sep 11 14:32:04 2009 +0200

    bio: first step in sanitizing the bio->bi_rw flag testing

Signed-off-by: Andy Whitcroft <apw@canonical.com>
UBUNTU: SAUCE: (no-up) raise the default console 'quiet' level to 2

In the interests of providing a clean boot experience, i.e., a blank screen
before X starts, supress noisy driver messages.

See https://lists.ubuntu.com/archives/kernel-team/2009-October/007476.html
for the original diatribe.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
UBUNTU: SAUCE: (no-up) trace: add trace events for open(), exec() and uselib()

BugLink: http://bugs.launchpad.net/bugs/462111

This patch uses TRACE_EVENT to add tracepoints for the open(),
exec() and uselib() syscalls so that ureadahead can cheaply trace
the boot sequence to determine what to read to speed up the next.

It's not upstream because it will need to be rebased onto the syscall
trace events whenever that gets merged, and is a stop-gap.

Signed-off-by: Scott James Remnant <scott@ubuntu.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
UBUNTU: SAUCE: (no-up) set /proc/acpi/video/*/DOS to 4 by default

BugLink: http://bugs.launchpad.net/bugs/458982

acpi_video_bus_start_devices() in drivers/acpi/video.c sets the default
ACPI DOS value to 0, which lets the OS handle toggling of display output
but still leaves the BIOS handling brightness levels automatically when
connecting/disconnecting AC.

We want the OS to handle both where possible, so a better default would
be to set this to 4.

This likely will regress systems using proprietary video drivers which
will need to change this setting back using the sysfs interfaces.

Signed-off-by: Andy Whitcroft <apw@canonical.com>