黄涛 14d96d73a2 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0 ...

Merge v3.0.65
Conflicts:
	Makefile
	drivers/net/wireless/ath/ath9k/beacon.c
	drivers/net/wireless/ath/ath9k/htc_hst.c

2013-02-18 12:31:44 +08:00

..

agp

char/agp: add another Ironlake host bridge

2012-06-17 11:23:10 -07:00

hw_random

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2011-05-20 17:24:14 -07:00

ipmi

revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

2011-10-28 16:02:47 +08:00

mwave

Fix common misspellings

2011-03-31 11:26:23 -03:00

pcmcia

revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

2011-10-28 16:02:47 +08:00

tpm

tpm: Propagate error from tpm_transmit to fix a timeout hang

2012-10-21 09:17:12 -07:00

xilinx_hwicap

drivercore: revert addition of of_match to struct device

2011-05-18 12:32:23 -06:00

apm-emulation.c

apm-emulation: apm_mutex breaks ACK; remove it

2011-05-23 12:50:43 +02:00

applicom.c

…

applicom.h

…

bfin-otp.c

…

briq_panel.c

…

bsr.c

powerpc/pseries/bsr: Remove redundant initialization of bsr dev_t declaration.

2011-05-04 16:02:40 +10:00

dcc_tty.c

revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

2011-10-28 16:02:47 +08:00

ds1302.c

…

ds1620.c

…

dsp56k.c

…

dtlk.c

…

efirtc.c

…

generic_nvram.c

…

genrtc.c

…

hangcheck-timer.c

…

hpet.c

revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

2011-10-28 16:02:47 +08:00

i8k.c

Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:09:59 +08:00

Kconfig

revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

2011-10-28 16:02:47 +08:00

lp.c

…

Makefile

revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

2011-10-28 16:02:47 +08:00

mbcs.c

…

mbcs.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

mem.c

revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

2011-10-28 16:02:47 +08:00

misc.c

Revert "Revert "drivers: misc: pass miscdevice pointer via file private data""

2011-12-13 12:05:43 +08:00

mmtimer.c

…

msm_smd_pkt.c

drivers/char: add MSM smd_pkt driver

2011-03-23 19:46:38 -07:00

mspec.c

Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts

2012-08-15 12:04:09 -07:00

nsc_gpio.c

…

nvram.c

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

nwbutton.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

nwbutton.h

…

nwflash.c

…

pc8736x_gpio.c

…

ppdev.c

drivers/char/ppdev.c: put gotten port value

2011-05-26 17:12:37 -07:00

ps3flash.c

…

ramoops.c

revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

2011-10-28 16:02:47 +08:00

random.c

random: mix in architectural randomness in extract_buf()

2012-08-15 12:04:29 -07:00

raw.c

Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"

2011-07-30 16:24:52 +08:00

rk_sysrq.c

rk_sysrq: fix for v2.6.36

2011-08-01 11:20:53 +08:00

rtc.c

…

scc.h

…

scx200_gpio.c

…

snsc_event.c

…

snsc.c

…

snsc.h

…

sonypi.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

tb0219.c

…

tlclk.c

…

toshiba.c

…

ttyprintk.c

TTY: ttyprintk, don't touch behind tty->write_buf

2012-10-07 08:27:25 -07:00

uv_mmtimer.c

…

viotape.c

…

virtio_console.c

virtio_console: Don't access uninitialized data.

2013-02-14 10:47:33 -08:00