arm: board-spade.h: comment out unused defines
arm: board-spade.h: change MSM_FB_SIZE to more informative form
zip: use variables instead of hardcoded paths
Makefile: add config for graphite optimizations (synergydev)
init: Kconfig: add config for graphite optimizations
add link-time optimization (synergydev)
zip: fix path for r710
defconfigs: enable graphite and link-time optimizations
block: urgent request: Update dispatch_urgent in case of requeue/reinsert

The block layer implements a mechanism for verifying that the device
driver won't be notified of an URGENT request if there is already an
URGENT request in flight. This is due to the fact that interrupting an
URGENT request isn't efficient.
This patch fixes the above described mechanism in case the URGENT request
was returned back to the block layer from some reason: by requeue or
reinsert.

CRs-fixed: 473376, 473036, 471736
Change-Id: Ie8b8208230a302d4526068531616984825f1050d
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
block: urgent: Fix dispatching of URGENT mechanism

There are cases when blk_peek_request is called not from blk_fetch_request
thus the URGENT request may be started but the flag q->dispatched_urgent is
not updated.

Change-Id: I4fb588823f1b2949160cbd3907f4729767932e12
CRs-fixed: 471736
CRs-fixed: 473036
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
Linux 3.0.80

commit f9429439e89dd9e7440de0334f3eefcd3a37adf4
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Fri May 24 11:09:48 2013 -0700

    Linux 3.0.80

commit e51c0ea1c933d98e3f0ea5bf0a8a3149475cf0a1
Author: Alan Cox <alan@linux.intel.com>
Date:   Thu Aug 9 12:33:52 2012 -0300

    media: mantis: fix silly crash case

    commit e1d45ae10aea8e8a403e5d96bf5902ee670007ff upstream.

    If we set mantis->fe to NULL on an error its not a good idea to then try
    passing NULL to the unregister paths and oopsing really.

    Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=16473

    Signed-off-by: Alan Cox <alan@linux.intel.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
    Cc: Bjørn Mork <bjorn@mork.no>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 38180ec039a7589112633b85b2cfab72a76ec9c0
Author: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date:   Mon May 13 14:01:43 2013 +0800

    hwmon: fix error return code in abituguru_probe()

    commit ecacb0b17c08fae89f65468727f0e4b8e91da4e1 upstream.

    Fix to return a negative error code from the error handling
    case instead of 0, as done elsewhere in this function.

    Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 3f9831881378bae530028b35a7a06c811441162d
Author: Gabriel de Perthuis <g2p.code@gmail.com>
Date:   Mon May 6 17:40:18 2013 +0000

    btrfs: don't stop searching after encountering the wrong item

    commit 03b71c6ca6286625d8f1ed44aabab9b5bf5dac10 upstream.

    The search ioctl skips items that are too large for a result buffer, but
    inline items of a certain size occuring before any search result is
    found would trigger an overflow and stop the search entirely.

    Bug: https://bugzilla.kernel.org/show_bug.cgi?id=57641

    Signed-off-by: Gabriel de Perthuis <g2p.code+btrfs@gmail.com>
    Signed-off-by: Josef Bacik <jbacik@fusionio.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Revert "mms_fb: display: init pipe default configure as solidfill"

This reverts commit 1507a61f970dbf512045c1868ff3e047dd3cabc1.
Merge branch 'cm-10.1-wip' into cm-10.1
Merge branch 'cm-10.1' of git://github.com/Mustaavalkosta/htc7x30-3.0 into rowshow

Conflicts:
	zip
Merge branch 'rowshow' of github.com:yanniks/RowShow-7x30 into rs-dev