黄涛 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

..

3g_module

rk2928phonepad: sc6610:add resume and suspend

2012-10-25 20:31:29 +08:00

bp

rk30_phonepad: update some driver from c8003

2012-11-18 13:01:01 +08:00

c2port

Fix common misspellings

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

carma

misc: Add CARMA DATA-FPGA Programmer support

2011-05-19 16:55:10 +10:00

cb710

mmc: cb710 core: Add missing spin_lock_init for irq_lock of struct cb710_chip

2012-02-13 11:06:13 -08:00

eeprom

misc/at24: add more sanity checks for parameters

2010-12-24 02:14:17 -07:00

gps

gps:add gps support for rk2928 and rk3066b

2012-09-17 21:53:32 +08:00

ibmasm

Merge branch 'master' into for-next

2011-04-26 10:22:59 +02:00

inv_mpu

rk30 phone:wm831x use gpio i2c and fix kernel death

2012-04-13 18:24:55 +08:00

iwmc3200top

Fix common misspellings

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

lis3lv02d

lis3: fix regression of HP DriveGuard with 8bit chip

2011-10-16 14:14:51 -07:00

rk29_modem

3g: remove duplicate oper

2012-04-01 14:42:19 +08:00

rk2928_callpad_misc

rk2928_phonepad: remove exp gpio

2012-10-23 16:31:44 +08:00

sgi-gru

sanitize <linux/prefetch.h> usage

2011-05-20 12:50:29 -07:00

sgi-xp

SGI-XP: handle non-fatal traps

2013-01-27 20:46:29 -08:00

ti-st

drivers:misc: ti-st: fix skipping of change remote baud

2011-06-07 10:01:18 -07:00

ab8500-pwm.c

misc: Add ab8500 pwm driver

2010-10-29 00:29:21 +02:00

ad525x_dpot-i2c.c

drivers/misc/ad525x_dpot.c: new features

2010-10-26 16:52:14 -07:00

ad525x_dpot-spi.c

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

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

ad525x_dpot.c

drivers/misc/ad525x_dpot.c: new features

2010-10-26 16:52:14 -07:00

ad525x_dpot.h

ad525x_dpot: use correct rdac channel for ad5251/ad5252

2010-10-26 16:52:14 -07:00

akm8963.c

rk3188 ds1006h: add akm8963

2013-01-29 15:26:26 +08:00

akm8975.c

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

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

apanic.c

apanic: do not depend on android ram console

2011-11-15 21:24:12 +08:00

apds990x.c

drivers/misc/apds990x.c: apds990x_chip_on() should depend on CONFIG_PM || CONFIG_PM_RUNTIME

2011-06-15 20:04:02 -07:00

apds9802als.c

drivers/misc/apds9802als.c: put the device into runtime suspend after resume()/probe() is handled

2011-03-22 17:44:10 -07:00

arm-charlcd.c

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00

atmel_pwm.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

atmel_tclib.c

drivers/misc/atmel_tclib.c: fix a memory leak

2011-03-22 17:44:11 -07:00

atmel-ssc.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

bh1770glc.c

drivers/misc/bh1770glc.c: error handling in bh1770_power_state_store()

2010-11-12 07:55:31 -08:00

bh1780gli.c

treewide: cleanup continuations and remove logging message whitespace

2011-04-26 10:24:37 +02:00

bmp085.c

Fix common misspellings

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

cs5535-mfgpt.c

cs5535-mfgpt: don't call __init function from __devinit

2012-03-12 10:33:03 -07:00

ds1682.c

sysfs: add struct file* to bin_attr callbacks

2010-05-21 09:37:31 -07:00

enclosure.c

Revert "Merge commit 'v2.6.32.9' into android-2.6.32"

2011-07-30 22:24:29 +08:00

ep93xx_pwm.c

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

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

fm580x.c

add fm rda580x driver support

2011-05-20 23:34:37 +08:00

fm580x.h

add fm rda580x driver support

2011-05-20 23:34:37 +08:00

hmc6352.c

drivers/misc/hmc6352.c: fix wrong return value checking for i2c_master_recv()

2011-03-22 17:44:10 -07:00

hpilo.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

2010-10-22 19:36:42 -07:00

hpilo.h

hpilo: fix pointer warning in ilo_ccb_setup

2010-08-09 20:45:05 -07:00

ics932s401.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

ioc4.c

drivers/misc/ioc4.c: fix section mismatch / race condition

2011-06-27 18:00:13 -07:00

isl29003.c

isl29003: fix resume functionality

2009-05-06 16:36:10 -07:00

isl29020.c

drivers/misc/isl29020.c: remove incorrect kfree in isl29020_remove()

2010-11-25 06:50:47 +09:00

Kconfig

rk3188 ds1006h: add akm8963

2013-01-29 15:26:26 +08:00

kgdbts.c

x86,kgdb: Fix DEBUG_RODATA limitation using text_poke()

2012-04-13 08:14:07 -07:00

lkdtm.c

drivers/misc/lkdtm.c: fix race when crashpoint is hit multiple times before checking count

2011-06-27 18:00:13 -07:00

Makefile

rk3188 ds1006h: add akm8963

2013-01-29 15:26:26 +08:00

modem_sound.c

rk2928phonepad:

2012-10-24 17:48:13 +08:00

modem_sound.h

rk2928phonepad modem_sound :

2012-10-25 19:00:45 +08:00

mtk23d.c

A22:fix mtk23d.c compile warning

2012-01-14 10:55:48 +08:00

pch_phub.c

pch_phub: Improve ADE(Address Decode Enable) control

2012-04-22 16:21:42 -07:00

phantom.c

drivers/misc/phantom.c: add missing warning messages in phantom_probe()

2010-10-26 16:52:14 -07:00

pti.c

pti: PTI semantics fix in pti_tty_cleanup.

2011-06-07 10:01:20 -07:00

sc8800.c

sc8803: update sc8800.c

2012-06-20 16:26:37 +08:00

spear13xx_pcie_gadget.c

pcie-gadget-spear: Add "platform:" prefix for platform modalias

2011-11-26 09:09:59 -08:00

tdsc8800.c

modify tdsc8800 bug.

2012-06-26 09:08:00 +08:00

ti_dac7512.c

drivers/misc: add driver for Texas Instruments DAC7512

2009-12-15 08:53:25 -08:00

tifm_7xx1.c

dma-mapping: replace all DMA_32BIT_MASK macro with DMA_BIT_MASK(32)

2009-04-07 08:31:11 -07:00

tifm_core.c

workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'

2011-02-16 17:48:59 +01:00

tsl2550.c

tsl2550: Move from i2c/chips to misc

2010-03-13 20:56:54 +01:00

uid_stat.c

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

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

vmw_balloon.c

workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'

2011-02-16 17:48:59 +01:00

wl127x-rfkill.c

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

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