Merge remote-tracking branch 'aufs/aufs3.x-rcN' into linux-3.18.y-mbp
Merge remote-tracking branch 'mszeredi/overlayfs-next' into linux-3.18.y-mbp
XATTR_USER_PREFIX from gentoo-sources

Signed-off-by: Javier Marcet <javier@marcet.info>
kcopy-patch-for-infiniband-driver from gentoo-sources

Signed-off-by: Javier Marcet <javier@marcet.info>
dev-root-proc-mount-fix from gentoo-sources

Signed-off-by: Javier Marcet <javier@marcet.info>
s2disk-resume-image-fix from gentoo-sources

Signed-off-by: Javier Marcet <javier@marcet.info>
fbcondecor-0.9.6 from gentoo-sources

Signed-off-by: Javier Marcet <javier@marcet.info>
distro-Gentoo-Kconfig from gentoo-sources

Signed-off-by: Javier Marcet <javier@marcet.info>
libata: Add ALPM power state accounting to the AHCI driver

PowerTOP wants to be able to show the user how effective the ALPM link
power management is for the user. ALPM is worth around 0.5W on a quiet
link; PowerTOP wants to be able to find cases where the "quiet link" isn't
actually quiet.

This patch adds state accounting functionality to the AHCI driver for
PowerTOP to use.
The parts of the patch are
1) the sysfs logic of exposing the stats for each state in sysfs
2) the basic accounting logic that gets update on link change interrupts
   (or when the user accesses the info from sysfs)
3) a "accounting enable" flag; in order to get the accounting to work,
   the driver needs to get phyrdy interrupts on link status changes.
   Normally and currently this is disabled by the driver when ALPM is
   on (to reduce overhead); when PowerTOP is running this will need
   to be on to get usable statistics... hence the sysfs tunable.

The PowerTOP output currently looks like this:

Recent SATA AHCI link activity statistics
Active	Partial	Slumber	Device name
  0.5%	 99.5%	  0.0%	host0

(work to resolve "host0" to a more human readable name is in progress)

Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Javier Marcet <javier@marcet.info>
vfs: Add a trace point in the mark_inode_dirty function

PowerTOP would like to be able to show who is keeping the disk
busy by dirtying data. The most logical spot for this is in the vfs
in the mark_inode_dirty() function, doing this on the block level
is not possible because by the time the IO hits the block layer the
guilty party can no longer be found ("kjournald" and "pdflush" are not
useful answers to "who caused this file to be dirty).

The trace point follows the same logic/style as the block_dump code
and pretty much dumps the same data, just not to dmesg (and thus to
/var/log/messages) but via the trace events streams.

Eventually we should be able to phase out the block dump code, but that's
for later on after a transition time.

Signed-off-by: Javier Marcet <javier@marcet.info>
Prioritize DVB-T over DVB_C on drxk frontends

Signed-off-by: Javier Marcet <javier@marcet.info>
Get rid of the '+' added when only the short LOCALVERSION is requested

Signed-off-by: Javier Marcet <javier@marcet.info>
drivers: clocksource: dbx500-prcmu: Add boottime support

Change-Id: I9b5e3d050131c08c08786ae84cb76619c0525049
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32055
Signed-off-by: Javier Marcet <javier@marcet.info>
Make kvm allow_unsafe_assigned_interrupts the default

Signed-off-by: Javier Marcet <javier@marcet.info>
Disable ACPI's default strict enforcing of resources

Signed-off-by: Javier Marcet <javier@marcet.info>
Do not accept sysrq characters via serial port

Signed-off-by: Javier Marcet <javier@marcet.info>
Change default fn mode to F keys first
HID: apple: option to swap the 'Ctrl' and 'Command' ("Flag") keys.

In Apple's OSX, Command keys are used like Ctrl keys (Command-C, Command-X,
Command-V, ...). In a non Apple world, the Ctrl key is too far to be
confortable to use, thus this option to make Apple keyboards a delight
to use elsewhere.
HID: apple: add KEY_SYSRQ mapping to KEY_EJECTCD to apple_fn_keys[] table
HID: apple: disable hardcoded ISO layout as default