diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-21 18:00:47 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-21 18:00:47 -0500 |
| commit | b08b69a110bd981909c248f89997dcdcdfd5a39c (patch) | |
| tree | a6b95952bb997d92e575304abb5a3d5c0ebdc73f /fs/file_table.c | |
| parent | b4f5c46245cf4ca437849c0d04c176b4c150622d (diff) | |
| parent | d1061331b72e2e1420187e4684740b4a481c73a4 (diff) | |
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S5PV210: Fix regulator names
ARM: S5PV210: Update max8998_platform_data
ARM: SAMSUNG: Drop exporting s3c24xx_ts_set_platdata
ARM: S5P: Fix end address in memory resource information for UART devices
ARM: S5P64X0: Cleanup map.h file
ARM: S5P6442: Cleanup map.h file
ARM: S5PC100: Clenaup map.h file
ARM: S5PV210: Cleanup map.h file
ARM: S5PV310: Cleanup map.h file
Diffstat (limited to 'fs/file_table.c')
0 files changed, 0 insertions, 0 deletions