diff options
author | 2014-01-26 11:06:16 -0800 | |
---|---|---|
committer | 2014-01-26 11:06:16 -0800 | |
commit | 77d143de75812596a58d126606f42d1214e09dde (patch) | |
tree | 2f462fdf839e914fda343dfd3682b914b0a796f4 /arch/cris | |
parent | Merge tag 'mmc-updates-for-3.14-rc1' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | um: hostfs: make functions static (diff) | |
download | linux-77d143de75812596a58d126606f42d1214e09dde.tar.gz linux-77d143de75812596a58d126606f42d1214e09dde.tar.bz2 linux-77d143de75812596a58d126606f42d1214e09dde.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML changes from Richard Weinberger:
"This time only various cleanups and housekeeping patches"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: hostfs: make functions static
um: Include generic barrier.h
um: Removed unused attributes from thread_struct
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions