黄涛 8aac13f440 Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0 ...

Conflicts:
	drivers/mmc/card/block.c
	drivers/net/usb/asix.c
	drivers/net/wireless/airo.c
	drivers/net/wireless/ath/ath5k/base.c
	drivers/net/wireless/ath/ath9k/ar9002_calib.c
	drivers/net/wireless/ath/ath9k/ar9002_hw.c
	drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	drivers/net/wireless/ath/ath9k/ar9003_hw.c
	drivers/net/wireless/ath/ath9k/ar9003_phy.h
	drivers/net/wireless/ath/ath9k/hw.c
	drivers/net/wireless/ath/ath9k/hw.h
	drivers/net/wireless/ath/ath9k/init.c
	drivers/net/wireless/ath/ath9k/main.c
	drivers/net/wireless/ath/ath9k/pci.c
	drivers/net/wireless/b43/main.c
	drivers/net/wireless/hostap/hostap_main.c
	drivers/net/wireless/iwlwifi/iwl-5000.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-power.c
	drivers/net/wireless/iwlwifi/iwl-scan.c
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/rt2x00/rt2800lib.c
	drivers/net/wireless/rt2x00/rt2800usb.c
	drivers/net/wireless/rt2x00/rt2x00mac.c
	drivers/net/wireless/rt2x00/rt2x00queue.c
	drivers/net/wireless/rt2x00/rt2x00queue.h
	drivers/net/wireless/rt2x00/rt2x00usb.c
	drivers/usb/serial/option.c

2011-11-09 13:06:28 +08:00

..

9p

fs/9p: Use protocol-defined value for lock/getlock 'type' field.

2011-10-03 11:40:22 -07:00

adfs

Fix common misspellings

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

affs

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

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

afs

AFS: Use i_generation not i_version for the vnode uniquifier

2011-06-16 11:44:48 -04:00

autofs4

autofs4: bogus dentry_unhash() added in ->unlink()

2011-05-30 01:50:53 -04:00

befs

befs: Validate length of long symbolic links.

2011-08-29 13:29:06 -07:00

bfs

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

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

btrfs

btrfs: fix d_off in the first dirent

2011-10-03 11:41:03 -07:00

cachefiles

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

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

ceph

ceph analog of cifs build_path_from_dentry() race fix

2011-07-16 23:43:58 -04:00

cifs

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

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

coda

coda_ioctl_permission() is safe in RCU mode

2011-06-20 10:44:19 -04:00

configfs

configfs: remove unnecessary dentry_unhash on rmdir, dir rename

2011-05-28 01:02:54 -04:00

cramfs

Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

2011-10-28 16:07:07 +08:00

debugfs

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

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

devpts

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

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

dlm

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

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

ecryptfs

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

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

efs

block: remove per-queue plugging

2011-03-10 08:52:07 +01:00

exofs

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

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

exportfs

vfs: Add open by file handle support

2011-03-15 02:21:44 -04:00

ext2

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

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

ext3

ext3: Properly count journal credits for long symlinks

2011-08-15 18:31:42 -07:00

ext4

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

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

fat

Revert "temp revert rk change"

2011-11-04 17:43:18 +08:00

freevxfs

treewide: fix a few typos in comments

2011-05-10 10:16:21 +02:00

fscache

FS-Cache: Fix __fscache_uncache_all_inode_pages()'s outer loop

2011-07-21 10:59:16 -07:00

fuse

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

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

gfs2

GFS2: Fix mount hang caused by certain access pattern to sysfs files

2011-08-04 21:58:42 -07:00

hfs

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

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

hfsplus

hfsplus: Fix kfree of wrong pointers in hfsplus_fill_super() error path

2011-10-25 07:10:17 +02:00

hostfs

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

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

hpfs

hpfs: remove unnecessary dentry_unhash on rmdir, dir rename

2011-05-28 01:02:54 -04:00

hppfs

hppfs_lookup(): don't open-code lookup_one_len()

2011-07-17 23:22:48 -04:00

hugetlbfs

mm: don't access vm_flags as 'int'

2011-05-26 09:20:31 -07:00

isofs

isofs: fix bh leak in isofs_fill_super() error case

2011-06-18 07:25:42 -07:00

jbd

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

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

jbd2

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

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

jffs2

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

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

jfs

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

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

lockd

NLM: Don't hang forever on NLM unlock requests

2011-06-15 11:24:27 -04:00

logfs

logfs doesn't need ->permission() at all

2011-06-20 10:44:26 -04:00

minix

minix: remove unnecessary dentry_unhash on rmdir, dir rename

2011-05-28 01:02:54 -04:00

ncpfs

ncpfs: fix rename over directory with dangling references

2011-05-28 01:02:53 -04:00

nfs

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

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

nfs_common

Fix common misspellings

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

nfsd

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

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

nilfs2

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

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

nls

…

notify

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

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

ntfs

Fix common misspellings

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

ocfs2

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

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

omfs

Remove unneeded version.h includes from fs/

2011-06-24 08:34:22 -07:00

openpromfs

fs: icache RCU free inodes

2011-01-07 17:50:26 +11:00

partitions

Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

2011-10-28 16:07:07 +08:00

proc

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

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

pstore

pstore: fix pstore filesystem mount/remount issue

2011-05-16 11:05:00 -07:00

qnx4

block: remove per-queue plugging

2011-03-10 08:52:07 +01:00

quota

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

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

ramfs

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

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

reiserfs

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

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

romfs

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

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

squashfs

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

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

sysfs

Revert "sysfs: Fix sysfs owner and group."

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

sysv

sysv: remove unnecessary dentry_unhash from rmdir, dir rename

2011-05-28 01:02:50 -04:00

ubifs

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

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

udf

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

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

ufs

ufs should use d_splice_alias()

2011-07-17 23:21:35 -04:00

xfs

xfs: revert to using a kthread for AIL pushing

2011-10-25 07:10:16 +02:00

yaffs2

Revert "temp revert rk change"

2011-11-04 17:43:18 +08:00

aio.c

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

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

anon_inodes.c

sanitize vfsmount refcounting changes

2011-01-16 13:47:07 -05:00

attr.c

Cache xattr security drop check for write v2

2011-05-28 12:02:09 -04:00

bad_inode.c

bad_inode_permission() is safe from RCU mode

2011-06-20 10:44:00 -04:00

binfmt_aout.c

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

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

binfmt_elf_fdpic.c

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

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

binfmt_elf.c

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

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

binfmt_em86.c

…

binfmt_flat.c

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

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

binfmt_misc.c

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

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

binfmt_script.c

Make do_execve() take a const filename pointer

2010-08-17 18:07:43 -07:00

binfmt_som.c

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

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

bio-integrity.c

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

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

bio.c

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

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

block_dev.c

Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

2011-11-09 13:06:28 +08:00

buffer.c

Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

2011-10-28 16:07:07 +08:00

char_dev.c

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

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

compat_binfmt_elf.c

…

compat_ioctl.c

Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

2011-01-07 14:39:20 -08:00

compat.c

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

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

dcache.c

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

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

dcookies.c

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

2011-07-30 16:01:15 +08:00

direct-io.c

Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block

2011-03-24 10:16:26 -07:00

drop_caches.c

vmscan: change shrinker API by passing shrink_control struct

2011-05-25 08:39:26 -07:00

eventfd.c

Docbook: add fs/eventfd.c and fix typos in it

2011-02-21 15:07:04 -08:00

eventpoll.c

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

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

exec.c

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

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

fcntl.c

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

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

fhandle.c

fs/fhandle.c: add <linux/personality.h> for ia64

2011-04-14 16:06:56 -07:00

fifo.c

Filesystem: fifo: Fixed coding style issue.

2011-03-21 00:16:09 -04:00

file_table.c

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

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

file.c

vfs: avoid large kmalloc()s for the fdtable

2011-04-28 11:28:20 -07:00

filesystems.c

fs: synchronize_rcu when unregister_filesystem success not failure

2011-04-17 10:42:01 -07:00

fs_struct.c

sanitize vfsmount refcounting changes

2011-01-16 13:47:07 -05:00

fs-writeback.c

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

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

generic_acl.c

userns: rename is_owner_or_cap to inode_owner_or_capable

2011-03-23 19:47:13 -07:00

inode.c

mm: fix assertion mapping->nrpages == 0 in end_writeback()

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

internal.h

fs: move i_wb_list out from under inode_lock

2011-03-24 21:17:51 -04:00

ioctl.c

vfs: cleanup do_vfs_ioctl()

2011-03-21 00:16:08 -04:00

ioprio.c

ioprio: grab rcu_read_lock in sys_ioprio_{set,get}()

2010-11-15 10:23:31 +01:00

Kconfig

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

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

Kconfig.binfmt

coredump: default CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y

2010-10-27 18:03:12 -07:00

libfs.c

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

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

locks.c

fs: fix lock initialization

2011-07-06 10:41:13 -07:00

Makefile

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

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

mbcache.c

vmscan: change shrinker API by passing shrink_control struct

2011-05-25 08:39:26 -07:00

mpage.c

mm/fs: add hooks to support cleancache

2011-05-26 10:01:43 -06:00

namei.c

restore pinning the victim dentry in vfs_rmdir()/vfs_rename_dir()

2011-10-03 11:40:30 -07:00

namespace.c

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

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

nfsctl.c

open-style analog of vfs_path_lookup()

2011-03-14 09:15:28 -04:00

no-block.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

open.c

fs: Use BUG_ON(!mnt) at dentry_open().

2011-03-21 01:10:41 -04:00

pipe.c

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

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

pnode.c

fs: scale mntget/mntput

2011-01-07 17:50:33 +11:00

pnode.h

…

posix_acl.c

NFS: Prevent memory allocation failure in nfsacl_encode()

2011-01-25 15:24:47 -05:00

read_write.c

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

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

read_write.h

…

readdir.c

vfs: fix warning: 'dirent' is used uninitialized in this function

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

select.c

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

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

seq_file.c

fs: take dcache_lock inside __d_path

2010-10-25 21:26:12 -04:00

signalfd.c

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

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

splice.c

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

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

stack.c

…

stat.c

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

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

statfs.c

clean statfs-like syscalls up

2011-03-14 09:15:28 -04:00

super.c

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

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

sync.c

Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block

2011-03-24 10:16:26 -07:00

timerfd.c

timerfd: Fix wakeup of processes when timer is cancelled on clock change

2011-06-14 11:46:14 +02:00

utimes.c

userns: rename is_owner_or_cap to inode_owner_or_capable

2011-03-23 19:47:13 -07:00

xattr_acl.c

…

xattr.c

Cache xattr security drop check for write v2

2011-05-28 12:02:09 -04:00