diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 09:36:51 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 09:36:51 +0200 |
commit | 6396fc3b3ff3f6b942992b653a62df11dcef9bea (patch) | |
tree | db3c7cbe833b43c653adc99f70941431c5ff7c4e /.gitignore | |
parent | fix a typo on comments in mm/percpu.c (diff) | |
parent | Merge branch 'for-linus' of git://neil.brown.name/md (diff) | |
download | linux-6396fc3b3ff3f6b942992b653a62df11dcef9bea.tar.xz linux-6396fc3b3ff3f6b942992b653a62df11dcef9bea.zip |
Merge branch 'master' into for-next
Conflicts:
fs/exofs/inode.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions