linux-toradex.git/drivers/net/wireless, branch tegra-11.2.2 Linux kernel for Apalis and Colibri modules merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36 2011-02-21T05:12:36+00:00 Nitin Kumbhar nkumbhar@nvidia.com 2011-02-21T05:12:36+00:00 65aaf50c61234103c3d9359dd8d4558306a262f8 Conflicts: drivers/net/wireless/bcm4329/Makefile Change-Id: I5e6994d4db216062b9cd1673f45bd9fdcf1f96ae 
Conflicts:
	drivers/net/wireless/bcm4329/Makefile

Change-Id: I5e6994d4db216062b9cd1673f45bd9fdcf1f96ae
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36 2011-02-19T01:23:59+00:00 Rebecca Schultz Zavin rebecca@android.com 2011-02-19T01:23:59+00:00 01de8cb7aaf15245338261b25531736030be4063 






net: wireless: bcm4329: Fix disable pno call
2011-02-19T01:16:04+00:00

Greg Goldman
ggoldman@broadcom.com

2011-02-19T01:12:19+00:00

beb93055b74ce7608f2801b2efc025bb32313988

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>





Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>







Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
2011-02-16T17:56:33+00:00

Rebecca Schultz Zavin
rebecca@android.com

2011-02-16T17:56:33+00:00

fd57a71c00ece424649b261ee786264b3ac5b5f5












merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
2011-02-15T12:32:16+00:00

Nitin Kumbhar
nkumbhar@nvidia.com

2011-02-15T12:32:16+00:00

02e50de423e1f44158a01bfd59f00cd37d31ba5b

Conflicts:
	drivers/net/wireless/bcm4329/Makefile

Change-Id: I13ed89657bb43ac906c6424372050df5fd681374





Conflicts:
	drivers/net/wireless/bcm4329/Makefile

Change-Id: I13ed89657bb43ac906c6424372050df5fd681374







net: wireless: bcm4329: Get country translation from platform data
2011-02-15T02:08:19+00:00

Dmitry Shmidt
dimitrysh@google.com

2011-02-15T01:48:56+00:00

696ecacfc59e5a8e822afb6a8f92b35cfdcabb63

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>





Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>







Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
2011-02-15T00:11:42+00:00

Rebecca Schultz Zavin
rebecca@android.com

2011-02-15T00:11:42+00:00

852af15d6955402087821b2947f3a542ac836dda












net: wireless: bcm4329: Update to version 4.218.248-23
2011-02-14T23:54:42+00:00

Greg Goldman
ggoldman@broadcom.com

2011-02-14T23:54:42+00:00

60463e0ed16e0af62120db55b4c2f4c8b64acf64

- Add support to PNO with adaptive scan time
- Remove logic to generate Link Down based on Roaming Event
- Improve sco/esco detection method for BT COEX
- Add new function TXPOWER to reduce power if needed

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>





- Add support to PNO with adaptive scan time
- Remove logic to generate Link Down based on Roaming Event
- Improve sco/esco detection method for BT COEX
- Add new function TXPOWER to reduce power if needed

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>







merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
2011-02-14T08:36:01+00:00

Nitin Kumbhar
nkumbhar@nvidia.com

2011-02-14T08:36:01+00:00

08f0a2e4211ab0d75862d939440f3fde0a082266

Conflicts:
	drivers/usb/host/ehci-tegra.c
	include/linux/usb.h
	include/linux/usb/hcd.h

Change-Id: I2499459b717e36a2a994af9d7a5ae1ecb5e7ca9c





Conflicts:
	drivers/usb/host/ehci-tegra.c
	include/linux/usb.h
	include/linux/usb/hcd.h

Change-Id: I2499459b717e36a2a994af9d7a5ae1ecb5e7ca9c







Merge branch 'android-2.6.36' into android-tegra-2.6.36
2011-02-12T22:13:19+00:00

Colin Cross
ccross@android.com

2011-02-12T22:13:19+00:00

87666eb18a15ffecfbd6108a9e2cb0d54e33ec99