aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* futex: Make lookup_pi_state more robustreplicant-4.2-0004replicant-4.2-0003replicant-4.2Thomas Gleixner2014-07-171-17/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation of lookup_pi_state has ambigous handling of the TID value 0 in the user space futex. We can get into the kernel even if the TID value is 0, because either there is a stale waiters bit or the owner died bit is set or we are called from the requeue_pi path or from user space just for fun. The current code avoids an explicit sanity check for pid = 0 in case that kernel internal state (waiters) are found for the user space address. This can lead to state leakage and worse under some circumstances. Handle the cases explicit: Waiter | pi_state | pi->owner | uTID | uODIED | ? [1] NULL | --- | --- | 0 | 0/1 | Valid [2] NULL | --- | --- | >0 | 0/1 | Valid [3] Found | NULL | -- | Any | 0/1 | Invalid [4] Found | Found | NULL | 0 | 1 | Valid [5] Found | Found | NULL | >0 | 1 | Invalid [6] Found | Found | task | 0 | 1 | Valid [7] Found | Found | NULL | Any | 0 | Invalid [8] Found | Found | task | ==taskTID | 0/1 | Valid [9] Found | Found | task | 0 | 0 | Invalid [10] Found | Found | task | !=taskTID | 0/1 | Invalid [1] Indicates that the kernel can acquire the futex atomically. We came came here due to a stale FUTEX_WAITERS/FUTEX_OWNER_DIED bit. [2] Valid, if TID does not belong to a kernel thread. If no matching thread is found then it indicates that the owner TID has died. [3] Invalid. The waiter is queued on a non PI futex [4] Valid state after exit_robust_list(), which sets the user space value to FUTEX_WAITERS | FUTEX_OWNER_DIED. [5] The user space value got manipulated between exit_robust_list() and exit_pi_state_list() [6] Valid state after exit_pi_state_list() which sets the new owner in the pi_state but cannot access the user space value. [7] pi_state->owner can only be NULL when the OWNER_DIED bit is set. [8] Owner and user space value match [9] There is no transient state which sets the user space TID to 0 except exit_robust_list(), but this is indicated by the FUTEX_OWNER_DIED bit. See [4] [10] There is no transient state which leaves owner and user space TID out of sync. Backport to 3.13 conflicts: kernel/futex.c Change-Id: Ic410036b38ccb7289b3d58eff56ad64d3a9dcada Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: John Johansen <john.johansen@canonical.com> Cc: Kees Cook <keescook@chromium.org> Cc: Will Drewry <wad@chromium.org> Cc: Darren Hart <dvhart@linux.intel.com> Cc: stable@vger.kernel.org
* futex: Always cleanup owner tid in unlock_piThomas Gleixner2014-07-171-22/+18
| | | | | | | | | | | | | | | | If the owner died bit is set at futex_unlock_pi, we currently do not cleanup the user space futex. So the owner TID of the current owner (the unlocker) persists. That's observable inconsistant state, especially when the ownership of the pi state got transferred. Clean it up unconditionally. Change-Id: I4eeb2e139b720f1dd46e43407a96b3d9a19aacd1 Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Kees Cook <keescook@chromium.org> Cc: Will Drewry <wad@chromium.org> Cc: Darren Hart <dvhart@linux.intel.com> Cc: stable@vger.kernel.org
* futex: Validate atomic acquisition in futex_lock_pi_atomic()Thomas Gleixner2014-07-171-3/+11
| | | | | | | | | | | | | | | | | | | | | We need to protect the atomic acquisition in the kernel against rogue user space which sets the user space futex to 0, so the kernel side acquisition succeeds while there is existing state in the kernel associated to the real owner. Verify whether the futex has waiters associated with kernel state. If it has, return -EINVAL. The state is corrupted already, so no point in cleaning it up. Subsequent calls will fail as well. Not our problem. [ tglx: Use futex_top_waiter() and explain why we do not need to try restoring the already corrupted user space state. ] Change-Id: Ic8714ed2e9dee323a011eed42f7c0159c65dfbf3 Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Kees Cook <keescook@chromium.org> Cc: Will Drewry <wad@chromium.org> Cc: stable@vger.kernel.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
* futex-prevent-requeue-pi-on-same-futex.patch futex: Forbid uaddr == uaddr2 ↵Thomas Gleixner2014-07-171-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | in futex_requeue(..., requeue_pi=1) If uaddr == uaddr2, then we have broken the rule of only requeueing from a non-pi futex to a pi futex with this call. If we attempt this, then dangling pointers may be left for rt_waiter resulting in an exploitable condition. This change brings futex_requeue() into line with futex_wait_requeue_pi() which performs the same check as per commit 6f7b0a2a5 (futex: Forbid uaddr == uaddr2 in futex_wait_requeue_pi()) [ tglx: Compare the resulting keys as well, as uaddrs might be different depending on the mapping ] Fixes CVE-2014-3153. Change-Id: I473bf486ad451de0bfd049a110b69795a6fda451 Reported-by: Pinkie Pie Signed-off-by: Will Drewry <wad@chromium.org> Signed-off-by: Kees Cook <keescook@chromium.org> Cc: stable@vger.kernel.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
* futex: Add another early deadlock detection checkThomas Gleixner2014-07-171-13/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dave Jones trinity syscall fuzzer exposed an issue in the deadlock detection code of rtmutex: http://lkml.kernel.org/r/20140429151655.GA14277@redhat.com That underlying issue has been fixed with a patch to the rtmutex code, but the futex code must not call into rtmutex in that case because - it can detect that issue early - it avoids a different and more complex fixup for backing out If the user space variable got manipulated to 0x80000000 which means no lock holder, but the waiters bit set and an active pi_state in the kernel is found we can figure out the recursive locking issue by looking at the pi_state owner. If that is the current task, then we can safely return -EDEADLK. The check should have been added in commit 59fa62451 (futex: Handle futex_pi OWNER_DIED take over correctly) already, but I did not see the above issue caused by user space manipulation back then. Change-Id: I5242efcdc3c08159c652fe645e1f85b27687e6ca Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Dave Jones <davej@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Darren Hart <darren@dvhart.com> Cc: Davidlohr Bueso <davidlohr@hp.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Clark Williams <williams@redhat.com> Cc: Paul McKenney <paulmck@linux.vnet.ibm.com> Cc: Lai Jiangshan <laijs@cn.fujitsu.com> Cc: Roland McGrath <roland@hack.frob.com> Cc: Carlos ODonell <carlos@redhat.com> Cc: Jakub Jelinek <jakub@redhat.com> Cc: Michael Kerrisk <mtk.manpages@gmail.com> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Link: http://lkml.kernel.org/r/20140512201701.097349971@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: stable@vger.kernel.org
* futex: Prevent attaching to kernel threadsThomas Gleixner2014-07-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We happily allow userspace to declare a random kernel thread to be the owner of a user space PI futex. Found while analysing the fallout of Dave Jones syscall fuzzer. We also should validate the thread group for private futexes and find some fast way to validate whether the "alleged" owner has RW access on the file which backs the SHM, but that's a separate issue. Change-Id: I03941dc5737bcb9d3ddd2ec88f7c263c27a1247d Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Dave Jones <davej@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Darren Hart <darren@dvhart.com> Cc: Davidlohr Bueso <davidlohr@hp.com> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Clark Williams <williams@redhat.com> Cc: Paul McKenney <paulmck@linux.vnet.ibm.com> Cc: Lai Jiangshan <laijs@cn.fujitsu.com> Cc: Roland McGrath <roland@hack.frob.com> Cc: Carlos ODonell <carlos@redhat.com> Cc: Jakub Jelinek <jakub@redhat.com> Cc: Michael Kerrisk <mtk.manpages@gmail.com> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Link: http://lkml.kernel.org/r/20140512201701.194824402@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: stable@vger.kernel.org
* n_tty: Fix n_tty_write crash when echoing in raw modePeter Hurley2014-07-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tty atomic_write_lock does not provide an exclusion guarantee for the tty driver if the termios settings are LECHO & !OPOST. And since it is unexpected and not allowed to call TTY buffer helpers like tty_insert_flip_string concurrently, this may lead to crashes when concurrect writers call pty_write. In that case the following two writers: * the ECHOing from a workqueue and * pty_write from the process race and can overflow the corresponding TTY buffer like follows. If we look into tty_insert_flip_string_fixed_flag, there is: int space = __tty_buffer_request_room(port, goal, flags); struct tty_buffer *tb = port->buf.tail; ... memcpy(char_buf_ptr(tb, tb->used), chars, space); ... tb->used += space; so the race of the two can result in something like this: A B __tty_buffer_request_room __tty_buffer_request_room memcpy(buf(tb->used), ...) tb->used += space; memcpy(buf(tb->used), ...) ->BOOM B's memcpy is past the tty_buffer due to the previous A's tb->used increment. Since the N_TTY line discipline input processing can output concurrently with a tty write, obtain the N_TTY ldisc output_lock to serialize echo output with normal tty writes. This ensures the tty buffer helper tty_insert_flip_string is not called concurrently and everything is fine. Note that this is nicely reproducible by an ordinary user using forkpty and some setup around that (raw termios + ECHO). And it is present in kernels at least after commit d945cb9cce20ac7143c2de8d88b187f62db99bdc (pty: Rework the pty layer to use the normal buffering logic) in 2.6.31-rc3. js: add more info to the commit log js: switch to bool js: lock unconditionally js: lock only the tty->ops->write call References: CVE-2014-0196 Reported-and-tested-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [bwh: Backported to 3.2: output_lock is a member of struct tty_struct] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Change-Id: Ifb8bf28246556efb3c42aa5d153ef7fb4ed95cbc
* omap: dss: Suspend DSS with earlysuspendreplicant-4.2-0002Paul Kocialkowski2014-06-291-0/+36
| | | | Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* omap: remoteproc: add a notification for loading errorMiguel Vadillo2014-06-293-1/+22
| | | | | | | | | | | | | | | | | | When calling rproc_get for the first time, the loading of the remoteproc image will be requested using a non-blocking request_firmware_no_wait, and the caller can continue before the actual loading is complete. The loader later can return an error due to a non-existing or wrong image and there should be a way to notify about this to users having a rproc handle. This functionality is added and is leveraged by rpmsg to release some resources it had already acquired since requesting a firmware load. Change-Id: I1d3523efbcfd613bca74d363084791ceaaaa9989 Signed-off-by: Miguel Vadillo <vadillo@ti.com>
* WiFi nvram path for tunareplicant-4.2-0001Paul Kocialkowski2014-01-121-1/+1
| | | | Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* Replicant kernel releasePaul Kocialkowski2014-01-031-2/+3
| | | | Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* Get rid of proprietary firmwares and related instructionsPaul Kocialkowski2014-01-03159-134968/+3
| | | | Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
* perf: Treat attr.config as u64 in perf_swevent_init()Tommi Rantala2013-06-121-1/+1
| | | | | | | | | | | | | | | | | | | Trinity discovered that we fail to check all 64 bits of attr.config passed by user space, resulting to out-of-bounds access of the perf_swevent_enabled array in sw_perf_event_destroy(). Introduced in commit b0a873ebb ("perf: Register PMU implementations"). Change-Id: I9a46294b3732d5e04b14142f2e50b22a43ebc986 Signed-off-by: Tommi Rantala <tt.rantala@gmail.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: davej@redhat.com Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Link: http://lkml.kernel.org/r/1365882554-30259-1-git-send-email-tt.rantala@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
* bcmdhd: workaround broken AC video queue in IBSS modeBruno Randolf2013-04-231-0/+5
| | | | | | | | | | | | | | | | The BCM4330 has problems with the WME video (AC_VI) queue in IBSS mode. If we put packets into this AC, the symptoms are excessive RTS/CTS, most packets get lost and the device get's stuck and no more packets can be sent, even on other queues. Since the AC queue selection happens in the firmware based on the DSCP priority and we don't know a way to configure this in the driver the workaround is to simply downgrade all packets which would go into AC_VI (priority 4 and 5, TOS 0x80 and 0xa0) to AC_BE (priority 3 "Excellent Effort"). It's not pretty but makes the device usable. Change-Id: I8911c0eef7f189fc55547f02279e7012bc267d47 Signed-off-by: Bruno Randolf <br1@einfach.org>
* bcmdhd: Enable Ad-Hoc (IBSS) modeBruno Randolf2013-03-011-2/+63
| | | | | | | | | | | This enables Ad-Hoc (IBSS) mode for bcmdhd. We basically just need to set the interface flag and avoid some P2P specific settings while scanning. Also add the "station get" command for IBSS mode. Signed-off-by: Bruno Randolf <br1@einfach.org> Change-Id: I10a047f76495d7fedfee16d0ac10de239e494567
* Merge "Restored ARP offload agent mode" into cm-10.1Brint E. Kriebel2013-02-171-4/+2
|\
| * Restored ARP offload agent modedjMesias2013-02-171-4/+2
| | | | | | | | | | | | Merged from 3.0-jb-mr1.1 Change-Id: Ifcb2d9b22c515e0ed096c56dc4f9dd9c63e22ab8
* | Merge "Variable GPU OC: sysfs interface to cycle through different top gpu ↵Brint E. Kriebel2013-02-172-0/+49
|\ \ | |/ |/| | | speeds" into cm-10.1
| * Variable GPU OC: sysfs interface to cycle through different top gpu speedsimoseyon2013-01-242-0/+49
| | | | | | | | | | | | | | | | - /sys/devices/system/cpu/cpu0/cpufreq/gpu_oc - for now: 0 = 307mhz, 1 = 384mhz, 2 = 512mhz - changes take effect immediately of course. Change-Id: I79f927faf3097b73616fd6bad0d633635903c6b3
* | Merge "Tuna : Enable ROW I/O Scheduler" into cm-10.1Robert Burns2013-02-161-0/+2
|\ \
| * | Tuna : Enable ROW I/O SchedulerDanesh Mondegarian2013-02-121-0/+2
| | | | | | | | | | | | Change-Id: I97eaebc85c96fd7838b420ecd16fbacd806c086b
* | | Merge "Add ROW I/O Scheduler by Qualcomm." into cm-10.1Robert Burns2013-02-164-0/+850
|\ \ \ | |/ /
| * | Add ROW I/O Scheduler by Qualcomm.franciscofranco2013-02-104-0/+850
| | | | | | | | | | | | | | | Change-Id: I937bfa6d1d7c3911fa5193e4849310a6a04bd0c2 Signed-off-by: franciscofranco <franciscofranco.1990@gmail.com>
* | | mm: Hold a file reference in madvise_removeAndy Lutomirski2013-02-151-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 9ab4233dd08036fe34a89c7dc6f47a8bf2eb29eb upstream. Otherwise the code races with munmap (causing a use-after-free of the vma) or with close (causing a use-after-free of the struct file). The bug was introduced by commit 90ed52ebe481 ("[PATCH] holepunch: fix mmap_sem i_mutex deadlock") [bwh: Backported to 3.2: - Adjust context - madvise_remove() calls vmtruncate_range(), not do_fallocate()] [luto: Backported to 3.0: Adjust context] Cc: Hugh Dickins <hugh@veritas.com> Cc: Miklos Szeredi <mszeredi@suse.cz> Cc: Badari Pulavarty <pbadari@us.ibm.com> Cc: Nick Piggin <npiggin@suse.de> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Andy Lutomirski <luto@amacapital.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* | | gpu: pvr: Update to DDK 1.8@2198402Alistair Strachan2013-02-157-19/+34
| | | | | | | | | | | | | | | | | | | | | - Implemented a DC API change which queues a dummy display flip to workaround a rare and difficult to reproduce synchronization deadlock. - Eliminate log spam from Linux shrinker integration.
* | | net: wireless: bcmdhd: Enable P2P probe request handling only during discoveryJithu Jance2013-02-154-4/+10
|/ / | | | | | | | | Change-Id: I2db29d5ed7f66f2a45feb890c81d510fcad24dd2 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | Tuna: Enable NTFS supportblunden2013-01-291-1/+1
|/ | | | | | NTFS read support is useful combined with our USB-OTG support. Change-Id: I92f75baad42c0410aef7cff105ff235afd4584fc
* Fixed voodoo multipliers stuffdjMesias2012-12-302-12/+7
| | | | | | | Added CONFIG_UHID=y to defconfig Restored omap_hsmmc.c to 3.0-jb-mr1 branch Change-Id: I2d72bcf1372caaff9ff65ab5f20daaeed0f70603
* Repair tuna kernel compilation missing labelKalimochoAz2012-11-231-0/+6
|
* Add voodoo multipliers stuffKalimochoAz2012-11-2350-497/+2737
|\ | | | | | | | | | | | | | | Full code based on Supercurio Stuff for Crespo Credits also for Ezekeel since he is the first to port this to GN Conflicts: drivers/video/omap2/displays/panel-s6e8aa0.c
| * Revert "net: wireless: bcmdhd: Fix WD wakelock behavior"Dmitry Shmidt2012-11-022-64/+8
| | | | | | | | This reverts commit 834029ac9d0ad8dea4e6a21bc34877dc3740b9f4.
| * use clamp_t in UNAME26 fixKees Cook2012-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 31fd84b95eb211d5db460a1dda85e004800a7b52 upstream. The min/max call needed to have explicit types on some architectures (e.g. mn10300). Use clamp_t instead to avoid the warning: kernel/sys.c: In function 'override_release': kernel/sys.c:1287:10: warning: comparison of distinct pointer types lacks a cast [enabled by default] Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * kernel/sys.c: fix stack memory content leak via UNAME26Kees Cook2012-11-011-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 2702b1526c7278c4d65d78de209a465d4de2885e upstream. Calling uname() with the UNAME26 personality set allows a leak of kernel stack contents. This fixes it by defensively calculating the length of copy_to_user() call, making the len argument unsigned, and initializing the stack buffer to zero (now technically unneeded, but hey, overkill). CVE-2012-0957 Reported-by: PaX Team <pageexec@freemail.hu> Signed-off-by: Kees Cook <keescook@chromium.org> Cc: Andi Kleen <ak@linux.intel.com> Cc: PaX Team <pageexec@freemail.hu> Cc: Brad Spengler <spender@grsecurity.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Dmitry Shmidt2012-10-245-12/+94
| |\
| | * Merge branch 'android-3.0' into android-omap-3.0Dmitry Shmidt2012-10-245-12/+94
| | |\
| | | * net: wireless: bcmdhd: Fix WD wakelock behaviorDmitry Shmidt2012-10-242-8/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ebae2be248cbb4bc98e2b448641f65b77a320f4 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Conflicts: drivers/net/wireless/bcmdhd/dhd_linux.c
| | | * net: wireless: bcmdhd: Fix BSSID report for disassocDmitry Shmidt2012-10-243-4/+30
| | | | | | | | | | | | | | | | | | | | Change-Id: I5e3b01a1a471e5983ab934fc9d65802a389ab1af Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| * | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Todd Poynor2012-09-261-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'android-3.0' into android-omap-3.0Todd Poynor2012-09-261-1/+1
| | |\ \ | | | |/
| | | * timekeeping: fix 32-bit overflow in get_monotonic_boottimeColin Cross2012-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_monotonic_boottime adds three nanonsecond values stored in longs, followed by an s64. If the long values are all close to 1e9 the first three additions can overflow and become negative when added to the s64. Cast the first value to s64 so that all additions are 64 bit. Change-Id: Ic996d8b6fbef0b72f2d027b0d8ef5259b5c1a540 Signed-off-by: Colin Cross <ccross@android.com>
| * | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Dmitry Shmidt2012-09-201-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'android-3.0' into android-omap-3.0Dmitry Shmidt2012-09-201-1/+1
| | |\ \ | | | |/
| | | * net: wireless: bcmdhd: Adjust roaming treshold to -65 dBDmitry Shmidt2012-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I88bb0cf759ee4262f31f054ef2dd5fc6258e8628 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| * | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Dmitry Shmidt2012-09-176-2/+51
| |\ \ \ | | |/ /
| | * | Merge branch 'android-3.0' into android-omap-3.0Dmitry Shmidt2012-09-176-2/+51
| | |\ \ | | | |/
| | | * net: wireless: bcmdhd: Add print when power-save mode is OFFDmitry Shmidt2012-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Idc72198b2d59c76dd45ba918cef982bcd7b570ab Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | | * net: wireless: bcmdhd: Update wifi stack ps state if was changedDmitry Shmidt2012-09-174-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1ee0b6ee05077d1ed6cfb578b6384dfc9787c81 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Conflicts: drivers/net/wireless/bcmdhd/wl_cfg80211.h
| | | * net: wireless: bcmdhd: Add ROAM setting per platform from MakefleDmitry Shmidt2012-09-133-0/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia6bc3025e3641cb6b91022ab1c9976c0f6ad16a4 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| * | | input: mms_ts: max x/y are max coordinates, not the x/y sizeDima Zavin2012-09-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set max x/y to size - 1 Change-Id: I5bf99bfb45d5ae170049cc574694882e62194e60 Signed-off-by: Dima Zavin <dima@android.com>
| * | | Merge branch 'android-omap-3.0' into android-omap-tuna-3.0Dmitry Shmidt2012-09-071-0/+1
| |\ \ \ | | |/ /
generated by cgit v1.1 at 2025-08-22 10:24:36 +0000