Commit graph

613 commits

Author SHA1 Message Date
dalon.zhang
8a297b0552 camera : cif : v0.1.a Support rk3288 cif driver 2014-11-29 19:38:54 +08:00
zyc
85a9069c36 rk312x:cif: 1. soft reset cif before setting cif registers
2. raise cif qos the same as lcdc
                3. add 3A controls in soc camera framework
2014-08-14 17:09:33 +08:00
zyc
45023a37a5 rk312x:cif: add cif and ov2659 driver. 2014-08-08 15:26:16 +08:00
黄涛
fcef60e36f LSK v3.10 Android 14.07 release
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJT2ljqAAoJELSic+t+oim9DKAP+wYv7CYRRQzgQaqpTa2uBJi1
 xjEbS3qz/yWl+xw+Svd9JUGcm4SQg1rvYBd3uEHuqAxqrwaM5BbCHozCiM5ZWRJV
 Q0bR7Ha6RcVXAmNmrs2NaUC7zxIcS1LiBN9FxLPlsv44pxBxgIzQI4ZjN2SMEx5u
 COz3uW+xeVJHMRQ+BYwB/L+NNkgVZdFb71EUrxDiXJr1GWBuhOQ2aYGMRw55QXt5
 WoXUtAWGAQYWfUF6hBvpxEzB060ikOyBGxIdDQkeJdkNK3lD/Ql7M/FMii+H9njt
 FCGtIfV7j/aSzGDY2bW2yGart8N5AvP4T7rAU46+x2Cc9IwTigS8pYltdPv/YrF7
 VYEG4MR2JcYlXl1pCdRHikAOID2tCZS81mhdBFgvXCqSy4OanBOajmu8BGGORFD2
 RFUxALE0Cd+ZQ2JrGhLX+jvUC23FJNoHkcFGn0iE5nv5UJbC9XM7Do1XOe6EDb1r
 waOzjJD06OSAq8kDjExhjzDBhWuDWLdwo6/djsduo0FhI7XmmUs+ebeUne6OTuq5
 duUMXBt48Y4UMbI9v9aSRJVA4OBLfmIlu8ZU8N13BqoN3O4BcWkziUepngc0B+AI
 0ukzozgUjdmuvfmAKsA5OGwpJROtOx2NshsgSDVeFSaOWuqdM3dEE89paruT1qFX
 5NVLVS2Ptn1HuBwHDnW3
 =uFcV
 -----END PGP SIGNATURE-----

Merge tag 'lsk-v3.10-android-14.07' into develop-3.10

LSK v3.10 Android 14.07 release

Conflicts:
	drivers/clocksource/arm_arch_timer.c
	lib/Makefile
2014-08-06 15:34:14 +08:00
Mark Brown
471dd6b43f Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-07-01 11:20:33 +01:00
Mark Brown
d01bd6fdb3 This is the 3.10.46 stable release
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJTsiaNAAoJEDjbvchgkmk+6BAQAMCnoWzRHg19+0/sfRrKhOcW
 Y9dZHpZctunznnjkm72MO1lonS8t0u5GhjCbbzMiveQVxCywpMeaqhL5zPZ8dCnc
 zkX7WltI8bR9MtGTawZqVj/2M2+KCwkJ5rp6sB/4vtluzHUv0AO77yuW6VSZDC9+
 srdpvLEhIhgzYjxNZPlrOt3yInZEdORWHEvJACa1e9nnnbF86wUm1zHso4thdXGs
 s4Yyt8vfc2zARfupIYs6gklWzUGHSOXmEizITV5fzOXqzyRhi104F/qJI9ZIBpb0
 rGw1i59rvu3Aj3zRgnneKVpKBK62O6APbv9fZYJtTU0tzCrdeKkC846OZvrtRlUj
 Z2umcCK8GgR9zasJ2DjB1RZwLjJlW2HL7taX9472ZIGE6CyHS9cJer72cFibGWLv
 c0pFyDYDF2lH1i/ydUqMmY9D923xzQ4IUaoGwKi8LQMN2B8Uqczs8P/sZsfx87kj
 W6Zp6C/f9qfapyGyidmP1tAj4yUWsgfFlNi8/5Ti8EQDBfAwwDEetOmXxDyZOI6Z
 RiaddNESExipT+css/2enELVQMoHl5GZ0KhTPVx3c6FgZyRuDIF5ffsyoup/72lV
 +B+Vw0H4SbpmlskI/1Lr2Z/GmUq5I0CFgnHVR+bCMLnx8W0jXDngPFknqsi6TLSR
 AhLV6i5qWzxY8sc6abZW
 =xTJ9
 -----END PGP SIGNATURE-----

Merge tag 'v3.10.46' into linux-linaro-lsk

This is the 3.10.46 stable release
2014-07-01 11:19:52 +01:00
Wang, Xiaoming
d2c44167ec ALSA: compress: Cancel the optimization of compiler and fix the size of struct for all platform.
commit 2bd0ae464a upstream.

Cancel the optimization of compiler for struct snd_compr_avail
which size will be 0x1c in 32bit kernel while 0x20 in 64bit
kernel under the optimizer. That will make compaction between
32bit and 64bit. So add packed to fix the size of struct
snd_compr_avail to 0x1c for all platform.

Signed-off-by: Zhang Dongxing <dongxing.zhang@intel.com>
Signed-off-by: xiaoming wang <xiaoming.wang@intel.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-26 15:12:41 -04:00
Mark Brown
40329a6815 Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
Conflicts:
	net/wireless/nl80211.c
2014-06-19 11:42:18 +01:00
John Stultz
0b3d5ff454 Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 2014-06-18 09:32:43 -07:00
Dmitry Shmidt
47f7337804 nl80211: cumulative vendor command support patch
Based on commit d3fd06d0259232e1362c6d1da136970d26628467
Author: Johannes Berg <johannes.berg@intel.com>
Date:   Sat Jan 25 10:17:18 2014 -0800
    nl80211: vendor command support

Change-Id: I832eb4da295fe7b2c9bd8ff69ae80fe7bfe30add
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2014-06-17 13:42:34 -07:00
黄涛
ee25a425b9 lsk 14.05 android release
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJThhtPAAoJELSic+t+oim9fZ4P/jAn9ODwGqk/EhH6GOzo98G7
 mRvxwBvP+ZjR4sFeBt7opDKMfqnLul89K3MEXFriBrvlRrJD+cCPscosEOdxsdjH
 dtLYgIZa1xE4uACs+kSjWG5mwfKIcE9PPFw8LtPy17GBHDwVcVMYcXevy5capFMD
 eNydfhr4YdjzXsEXTygTLwj5PHEddSYWP8smUhEz9xfEC37UDdla4lxIIgkhHL4N
 Six9BivH+V1gm7TfiKYspCm1SCgWS4GessKNXSxBCvG0yyfFjfVBSI8fQnmCr3rJ
 ID5xWgFpLDaIFbEwsRwBkjsbJRrobTdYW4hI6h9y2TPBQVlyqm/sFjKxAfWRvm+N
 rqVHZWEpbShFPptCYPYt5m+Jz5nd0bN5Bp+uh7UOhNK0oPL9+Y+fJBhCfE9r8PtW
 qFbabDkClEUBdXuqQSoM0Iwo8do0k+WVk0wS2MKr4YW2iHT3GzT2+BC6mBhIJiES
 1vjK6sN1HmzAGYTdmqzozTx+e7AHi2ibgpBlCp8WBtxjS4/cgc8Mbl+Gj5iIbj8f
 7zgeOUKdUr/OpAx497wHA2vIHQ8N3+7+VJxnrt9QqtUICpInAKdTNW8Na5RNHKeU
 fd2fSsmAqjY85uCcanx2+XfJeUfKSoYXpz1xR4uTQEHggHCNoV/1zSni5Zg4bpc6
 YfKEvDhP7JRzYt/H6U7p
 =vZ08
 -----END PGP SIGNATURE-----

Merge tag 'lsk-android-14.05' into develop-3.10

lsk 14.05 android release

Conflicts:
	arch/arm/common/Kconfig
	arch/arm64/include/asm/arch_timer.h
	drivers/staging/android/fiq_debugger/fiq_debugger.c
	drivers/usb/Kconfig
2014-06-12 21:04:26 +08:00
Mark Brown
ad7782c911 Merge remote-tracking branch 'lsk/linux-linaro-lsk-android' into linux-linaro-lsk-android 2014-06-12 12:30:54 +01:00
Mark Brown
bda15ed543 Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
Conflicts:
	kernel/futex.c
	net/ipv6/route.c
2014-06-12 11:22:36 +01:00
Alex Shi
4a29519b4a Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-06-12 17:36:21 +08:00
Alex Shi
5f00470fca Merge tag v3.10.43 into linux-linaro-lsk
This is the 3.10.43 stable release
2014-06-12 15:01:53 +08:00
John Stultz
7e0967f127 Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 2014-06-11 12:24:59 -07:00
Greg Kroah-Hartman
3dbf235e48 USB: cdc-wdm: properly include types.h
commit 7ac3764fca upstream.

The file include/uapi/linux/usb/cdc-wdm.h uses a __u16 so it needs to
include types.h as well to make the build system happy.

Fixes: 3edce1cf81 ("USB: cdc-wdm: implement IOCTL_WDM_MAX_COMMAND")
Cc: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-11 12:03:25 -07:00
Bjørn Mork
d7432ebeac usb: cdc-wdm: export cdc-wdm uapi header
commit 7d1896360f upstream.

The include/uapi/linux/usb/cdc-wdm.h header defines cdc-wdm
userspace APIs and should be exported by make headers_install.

Fixes: 3edce1cf81 ("USB: cdc-wdm: implement IOCTL_WDM_MAX_COMMAND")
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-11 12:03:25 -07:00
Alex Shi
69284a3b89 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2014-06-09 12:57:26 +08:00
Alex Shi
3b8d7f4db3 Merge tag v3.10.42 into linux-linaro-lsk
This is the 3.10.42 stable release
2014-06-09 12:55:42 +08:00
Thierry Reding
839472b6fa drm/tegra: Remove gratuitous pad field
commit cbfbbabb89 upstream.

The version of the drm_tegra_submit structure that was merged all the
way back in 3.10 contains a pad field that was originally intended to
properly pad the following __u64 field. Unfortunately it seems like a
different field was dropped during review that caused this padding to
become unnecessary, but the pad field wasn't removed at that time.

One possible side-effect of this is that since the __u64 following the
pad is now no longer properly aligned, the compiler may (or may not)
introduce padding itself, which results in no predictable ABI.

Rectify this by removing the pad field so that all fields are again
naturally aligned. Technically this is breaking existing userspace ABI,
but given that there aren't any (released) userspace drivers that make
use of this yet, the fallout should be minimal.

Fixes: d43f81cbaf ("drm/tegra: Add gr2d device")
Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-06-07 13:25:32 -07:00
Mark Brown
c877dd2854 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
	arch/arm64/Makefile
2014-05-18 18:46:41 +01:00
Lorenzo Colitti
a03f539b16 net: ipv6: autoconf routes into per-device tables
Currently, IPv6 router discovery always puts routes into
RT6_TABLE_MAIN. This causes problems for connection managers
that want to support multiple simultaneous network connections
and want control over which one is used by default (e.g., wifi
and wired).

To work around this connection managers typically take the routes
they prefer and copy them to static routes with low metrics in
the main table. This puts the burden on the connection manager
to watch netlink to see if the routes have changed, delete the
routes when their lifetime expires, etc.

Instead, this patch adds a per-interface sysctl to have the
kernel put autoconf routes into different tables. This allows
each interface to have its own autoconf table, and choosing the
default interface (or using different interfaces at the same
time for different types of traffic) can be done using
appropriate ip rules.

The sysctl behaves as follows:

- = 0: default. Put routes into RT6_TABLE_MAIN as before.
- > 0: manual. Put routes into the specified table.
- < 0: automatic. Add the absolute value of the sysctl to the
       device's ifindex, and use that table.

The automatic mode is most useful in conjunction with
net.ipv6.conf.default.accept_ra_rt_table. A connection manager
or distribution could set it to, say, -100 on boot, and
thereafter just use IP rules.

Change-Id: I82d16e3737d9cdfa6489e649e247894d0d60cbb1
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
2014-05-16 18:19:20 +00:00
Mark Brown
a5d53ad243 Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Conflicts:
	Documentation/arm64/tagged-pointers.txt
	arch/arm64/Kconfig
	arch/arm64/boot/dts/Makefile
	arch/arm64/include/asm/arch_timer.h
	arch/arm64/include/asm/elf.h
	arch/arm64/include/asm/spinlock.h
	arch/arm64/kernel/smp.c
2014-05-15 20:29:29 +01:00
Dan Aloni
760b97f095 Move the EM_ARM and EM_AARCH64 definitions to uapi/linux/elf-em.h
Signed-off-by: Dan Aloni <alonid@stratoscale.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 909e3ee411)
Signed-off-by: Mark Brown <broonie@linaro.org>
2014-05-15 20:00:45 +01:00
Mark Brown
8de7c4692e Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android 2014-05-12 17:43:10 +01:00
John Stultz
53a9dbb18e Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 2014-05-09 15:16:40 -07:00
Mathieu Meisser
7723289804 HID: add missing hid usages mappings
Integrate several new definitions (not code) that
add additional hid mappings from the HID HUT 1.12
and approved additional requests.

Additions are taken from the commits in the
linux-input upstream: f362e69, 2a4d815, 3b5a7ab,
358f247, 701ba53, d09bbfd, af8036d, 5820e4d, a443255

Change-Id: Id0e1cff5828062009b4f94c987ac91f88f14652e
Signed-off-by: Mathieu Meisser <mmeisser@logitech.com>
Signed-off-by: Olivier Gay <ogay@logitech.com>
2014-04-28 18:43:29 +02:00
黄涛
7fe47454f2 lsk-android 14.04
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTWERtAAoJELSic+t+oim9JWYP/0QCExvsT5PIzWueVqblD8Kz
 QlJ/fnFd5xHlVUtF7EJJHlJP6psANlF3ol7UJSofS+V7DFKKU460c5qEqC6XpuXD
 9JdAByrHBfxhOolg0BCSTqSEM7KoZE6LDuEN+ZcDvR5mplHOfTPdtQIjNt2ZQ1A4
 IToz1gAc8yZLzsBSBY7lijLZ3cZAXG3EFwi6imHgdBn2YfK2W/A4qjVTOSdV/ntq
 ISSHDN30EI0dcJJP74pzP5c7S5M9liMDVaEwvzs9+8jYO7TkMqsUz37d2d1u91av
 HyXKMjp07dO4Ym0/iaONv44c3tmVfHrnJDTLZHU2V142KPgpmoplbvouqb9i6DmM
 Euv20a5f8IridDPsIYk1nfmMOP42DVeND2YGgdUFOvSMThE2S5dfhOSgxHeHqXms
 LKXC9ocYYugzDi8rwSCr85K/3rTueR9GUL5730W5ObEq/A8MladQSxtqybroE3uP
 VctJOlrLU2mxfzYU99pybU9CmUz5aZRQP0IUVUgRwK+NxpLhYevhbc22oOR8F/Fu
 qJ9sqNDohHWKH8MCN1NVfsad1CmefQbl5STffQuu1GpRx7elV+/Ri39P6J/0m1UI
 rNbTpGxhHD+0nEMCuxqMS/sknV/vIz4ht9WCAUTcLyUIaFiuihzWnaVo2n3//nDp
 hwg7gOS0O3m0VWxhSh9U
 =+kRa
 -----END PGP SIGNATURE-----

Merge tag 'lsk-android-14.04' into develop-3.10

lsk-android 14.04

Conflicts:
	Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
	drivers/pinctrl/pinconf-generic.c
	include/linux/pinctrl/consumer.h
	include/linux/pinctrl/pinconf-generic.h
2014-04-24 19:04:10 +08:00
Ruchi Kandoi
37a591d407 prctl: adds PR_SET_TIMERSLACK_PID for setting timer slack of an arbitrary thread.
Second argument is similar to PR_SET_TIMERSLACK, if non-zero then the
slack is set to that value otherwise sets it to the default for the thread.

Takes PID of the thread as the third argument.

This allows power/performance management software to set timer slack for
other threads according to its policy for the thread (such as when the
thread is designated foreground vs. background activity)

Change-Id: I744d451ff4e60dae69f38f53948ff36c51c14a3f
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2014-04-22 17:31:53 -07:00
Mark Brown
3736e39e6a Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/john.stultz/android into linux-linaro-lsk-android 2014-04-15 18:12:51 +01:00
黄涛
0ffd56dafe lsk 14.03 Android release
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTNAt2AAoJELSic+t+oim9a/8P/Redey2VDMEJ3n4GunW+a8vK
 X+ZjrRnTYItRcVZipuLsl+5KiQURv6k0jVI66ghf4SPmB6bzLkN05ug72WNkdijX
 MiAfT2R58pK+3WmKAtD2q4e64VC1Y4J1L2W68M1LIoMQkzmDYq4s2U1umlJ2BjiO
 /tLrqenOG3Xait/Lkp0OsQMN+Dql7hVL7CbjBK6r7BvXituJc4FZnrkTS/stm7hg
 7/znrNlwnbw1WTye3ZiLIz/rdILmvKGefYelm6/6V/ZHuF0fygxmXQFjP8pbBitW
 4G4PWCVQfrGAgnoEuvEAbvbkdC4ddqV26jjOye9dq67C7yC1LZVtjVsKEAqwweNq
 9+l3yoxZT3beHY9YalhDXbjgDbrpjT6GC8LhCInTwTox3ePxDw5ToS7ncb/csyDA
 8AN6paP3zYvHHv78G1wRJZN99VZe1qQjU/nt04qIhMT/CwFKN1Ld8T21snLRluAZ
 3ML68JxzYf2cD6MVUtXZFD4WJ6TQzaOeqkvmyRA3obQtkrW7uM8wWUL9OYrYD7p7
 M0UECOXmd5ouFjx4tr78QKT9WH/W+qyiq159hFE+OSmFnSXbK/HCFrX4oZqxAJbF
 P1cX/JHgf9ka+RR05dmaWHuTbLC0Ami6aFyJ/dpL9xwH6wegThdEylcD2F7I9+ei
 Y2LIwtS/H9B4aguKeY6x
 =g7zP
 -----END PGP SIGNATURE-----

Merge tag 'lsk-android-14.03' into develop-3.10

lsk 14.03 Android release
2014-04-15 12:51:10 +08:00
John Stultz
5f8e5d218d Merge remote-tracking branch 'android/android-3.10' into linaro-fixes/android-3.10 2014-04-04 16:24:26 -07:00
Greg Hackmann
0c423165c1 video: adf: ensure consistent alignment on userspace facing structs
64-bit types in structs create alignment problems when a 32-bit x86
userspace talks to an x86_64 kernel.  In most cases the 64-bit types can
be replaced with 32-bit ones, since they're being used for fds and
should have been __s32 in the first place.  For adf_vsync_event,
alignment can be enforced by making the timestamp an __aligned_u64.

Change-Id: I87cf73d8f57730bd7bb43ffce6b7b411eb0ff198
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-27 10:20:42 -07:00
yzq
bdafdac384 rk3288 chromium: drm grafic fb support for x11 mali gpu 2014-03-26 12:41:08 +08:00
qjb
c94512d406 rk3288 spdif: spdif sound support 2014-03-22 17:40:01 +08:00
Mark Brown
6a4f493c5d Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into linux-linaro-lsk-android 2014-02-20 22:49:06 +09:00
黄涛
c36cf48454 Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into develop-3.10 2014-02-10 16:23:36 +08:00
John Stultz
0c5c18ce48 Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10 2014-01-30 11:09:50 -08:00
Mark Brown
e986cff797 Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into linux-linaro-lsk-android 2014-01-22 15:36:05 +00:00
Greg Hackmann
c10c64d40b video: adf: define constants for device-custom ioctls
Device-custom ADF ioctls can use type ADF_IOCTL_TYPE and
nr >= ADF_IOCTL_NR_CUSTOM

Change-Id: Ia8270973df5100e996ca0e021ede60e54b9af72a
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-01-17 13:38:22 -08:00
Alex Shi
abc5c8153c Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2013-12-23 10:54:59 +08:00
Takashi Iwai
f4b017da47 ALSA: compress: Fix 64bit ABI incompatibility
commit 6733cf572a upstream.

snd_pcm_uframes_t is defined as unsigned long so it would take
different sizes depending on 32 or 64bit architectures.  As we don't
want this ABI incompatibility, and there is no real 64bit user yet,
let's make it the fixed size with __u32.

Also bump the protocol version number to 0.1.2.

Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-12-20 07:45:06 -08:00
Mark Brown
358194677f Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
Conflicts:
	drivers/staging/android/ion/ion_chunk_heap.c
	kernel/printk.c
2013-12-13 18:52:59 +00:00
黄涛
ce551444a1 i2c: rockchip: i2c_msg add scl_rate for compat support old driver 2013-12-13 19:44:36 +08:00
黄涛
8315cce6bb Merge remote-tracking branch 'origin/upstream/android-common-3.10' into linux-linaro-lsk-v3.10-android+android-common-3.10 2013-12-10 12:11:32 +08:00
黄涛
f46d87e03f Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into linux-linaro-lsk-v3.10-android+android-common-3.10 2013-12-10 12:10:55 +08:00
Amit Pundir
90a332678d epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled
Drop EPOLLWAKEUP from epoll events mask if CONFIG_PM_SLEEP is disabled.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
2013-11-25 11:05:09 -08:00
Mark Brown
c46f0e86d7 Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android 2013-11-21 10:16:35 +00:00
黄涛
1b62149c6e Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android' into linux-linaro-lsk-v3.10-android+android-common-3.10 2013-11-21 13:26:29 +08:00