diff options
| author | Bryan Huntsman <bryanh@codeaurora.org> | 2011-11-16 13:52:50 -0800 |
|---|---|---|
| committer | Bryan Huntsman <bryanh@codeaurora.org> | 2011-11-16 13:52:50 -0800 |
| commit | d074fa2796bdbc42c4f918c78d6711bafc80b1c8 (patch) | |
| tree | 033929706a0aae95f65c134a8fc09cec3fb3e75d /scripts/gcc-wrapper.py | |
| parent | 53ae1740b250e4d02dd7a6ca82075355ad99dc23 (diff) | |
| parent | 9ab6a29787b1221a697f85835645549668258bdc (diff) | |
Merge remote-tracking branch 'common/android-3.0' into msm-3.0
* common/android-3.0: (570 commits)
misc: remove kernel debugger core
ARM: common: fiq_debugger: dump sysrq directly to console if enabled
ARM: common: fiq_debugger: add irq context debug functions
net: wireless: bcmdhd: Call init_ioctl() only if was started properly for WEXT
net: wireless: bcmdhd: Call init_ioctl() only if was started properly
net: wireless: bcmdhd: Fix possible memory leak in escan/iscan
cpufreq: interactive governor: default 20ms timer
cpufreq: interactive governor: go to intermediate hi speed before max
cpufreq: interactive governor: scale to max only if at min speed
cpufreq: interactive governor: apply intermediate load on current speed
ARM: idle: update idle ticks before call idle end notifier
input: gpio_input: don't print debounce message unless flag is set
net: wireless: bcm4329: Skip dhd_bus_stop() if bus is already down
net: wireless: bcmdhd: Skip dhd_bus_stop() if bus is already down
net: wireless: bcmdhd: Improve suspend/resume processing
net: wireless: bcmdhd: Check if FW is Ok for internal FW call
tcp: Don't nuke connections for the wrong protocol
ARM: common: fiq_debugger: make uart irq be no_suspend
net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT
mm: avoid livelock on !__GFP_FS allocations
...
Conflicts:
arch/arm/mm/cache-l2x0.c
arch/arm/vfp/vfpmodule.c
drivers/mmc/core/host.c
kernel/power/wakelock.c
net/bluetooth/hci_event.c
Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
Diffstat (limited to 'scripts/gcc-wrapper.py')
| -rwxr-xr-x | scripts/gcc-wrapper.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/gcc-wrapper.py b/scripts/gcc-wrapper.py index cbe2eae7f43..97c08c035e8 100755 --- a/scripts/gcc-wrapper.py +++ b/scripts/gcc-wrapper.py @@ -54,6 +54,7 @@ allowed_warnings = set([ "inode.c:72", "inode.c:73", "inode.c:74", + "menu.c:128", "msm_sdcc.c:126", "msm_sdcc.c:128", "nf_conntrack_netlink.c:790", |