diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-13 02:26:45 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-13 02:26:45 +0200 |
commit | fd18f00dd9d4e896060aa3d3e074a04830b13e50 (patch) | |
tree | 0cd7462694033eeaa9a5fa7e50de397fcc658024 /fs/ocfs2/cluster/tcp.c | |
parent | Merge tag 'remoteproc-3.15-cleanups' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | blackfin: cleanup board files (diff) | |
download | linux-fd18f00dd9d4e896060aa3d3e074a04830b13e50.tar.xz linux-fd18f00dd9d4e896060aa3d3e074a04830b13e50.zip |
Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
Pull blackfin updates from Steven Miao:
"Code cleanup, some previously ignored patches, and bug fixes"
* tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
blackfin: cleanup board files
bf609: clock: drop unused clock bit set/clear functions
Blackfin: bf537: rename "CONFIG_ADT75"
Blackfin: bf537: rename "CONFIG_AD7314"
Blackfin: bf537: rename ad2s120x ->ad2s1200
blackfin: bf537: fix typo "CONFIG_SND_SOC_ADV80X_MODULE"
blackfin: dma: current count mmr is read only
bfin_crc: Move architecture independant crc header file out of the blackfin folder.
bf54x: drop unuesd HOST status,control,timeout registers bit define macros
blackfin: portmux: cleanup head file
Blackfin: remove "config IP_CHECKSUM_L1"
blackfin: Remove GENERIC_GPIO config option again
blackfin:Use generic /proc/interrupts implementation
blackfin: bf60x: fix typo "CONFIG_PM_BFIN_WAKE_PA15_POL"
Diffstat (limited to 'fs/ocfs2/cluster/tcp.c')
0 files changed, 0 insertions, 0 deletions