diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-02-02 16:58:05 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-02-02 16:58:05 +0800 |
| commit | 599a980adc5c2ba32f6aedcd87640b781d347d1f (patch) | |
| tree | 9163c58e47cf900303b6db19d2e6bd4468a43ecb /fs/fcntl.c | |
| parent | 203993cd89ec6395b6bfba948c2e424680dd622e (diff) | |
| parent | a65e28a0149261776678977962cfa0f90973e1d4 (diff) | |
Merge branch 'android-3.0' into imx_3.0.15_android
Conflicts:
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/net/wireless/Makefile
kernel/power/main.c
sound/soc/soc-core.c
Diffstat (limited to 'fs/fcntl.c')
0 files changed, 0 insertions, 0 deletions