diff options
author | Tejun Heo <tj@kernel.org> | 2010-01-05 01:17:33 +0100 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2010-01-05 01:17:33 +0100 |
commit | 32032df6c2f6c9c6b2ada2ce42322231824f70c2 (patch) | |
tree | b1ce838a37044bb38dfc128e2116ca35630e629a /arch/x86/lib/.gitignore | |
parent | percpu: refactor the code in pcpu_[de]populate_chunk() (diff) | |
parent | Merge branch 'limits_cleanup' of git://decibel.fi.muni.cz/~xslaby/linux (diff) | |
download | linux-32032df6c2f6c9c6b2ada2ce42322231824f70c2.tar.xz linux-32032df6c2f6c9c6b2ada2ce42322231824f70c2.zip |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
Diffstat (limited to 'arch/x86/lib/.gitignore')
-rw-r--r-- | arch/x86/lib/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/lib/.gitignore b/arch/x86/lib/.gitignore new file mode 100644 index 000000000000..8df89f0a3fe6 --- /dev/null +++ b/arch/x86/lib/.gitignore @@ -0,0 +1 @@ +inat-tables.c |