diff options
author | JP Abgrall <jpa@google.com> | 2013-03-05 19:47:25 -0800 |
---|---|---|
committer | JP Abgrall <jpa@google.com> | 2013-03-05 19:47:25 -0800 |
commit | 4aad13d07babf68c1d0d37ff1e5f797573c4fd2a (patch) | |
tree | 14548d72d78d6c12e572a78f03a6cce9732bbe56 /Documentation | |
parent | 9c1eb87855672aa078e4282c6c1944fc71259088 (diff) | |
parent | a276def548828763cf5ac228adf8c1ca73f8d4d3 (diff) | |
download | kernel_samsung_tuna-4aad13d07babf68c1d0d37ff1e5f797573c4fd2a.zip kernel_samsung_tuna-4aad13d07babf68c1d0d37ff1e5f797573c4fd2a.tar.gz kernel_samsung_tuna-4aad13d07babf68c1d0d37ff1e5f797573c4fd2a.tar.bz2 |
Merge remote-tracking branch 'common/android-3.0' into android-omap-3.0
* common/android-3.0:
net: ipv6: Don't purge default router if accept_ra=2
net: wireless: bcmdhd: Enable SUPPORT_PM2_ONLY mode
net: wireless: bcmdhd: Add SUPPORT_PM2_ONLY option
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions