summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'reiserfs-updates' from Jeff MahoneyLinus Torvalds2009-03-305-184/+192
|\
| * reiserfs: rename p_._ variablesJeff Mahoney2009-03-301-23/+23
| * reiserfs: rename p_s_tb to tbJeff Mahoney2009-03-301-1/+1
| * reiserfs: rename p_s_inode to inodeJeff Mahoney2009-03-301-2/+2
| * reiserfs: rename p_s_bh to bhJeff Mahoney2009-03-301-17/+18
| * reiserfs: rename p_s_sb to sbJeff Mahoney2009-03-301-7/+7
| * reiserfs: strip trailing whitespaceJeff Mahoney2009-03-301-7/+7
| * reiserfs: add atomic addition of selinux attributes during inode creationJeff Mahoney2009-03-302-1/+35
| * reiserfs: use generic readdir for operations across all xattrsJeff Mahoney2009-03-301-0/+1
| * reiserfs: journaled xattrsJeff Mahoney2009-03-303-3/+44
| * reiserfs: use generic xattr handlersJeff Mahoney2009-03-303-35/+9
| * reiserfs: make per-inode xattr locking more fine grainedJeff Mahoney2009-03-302-23/+1
| * reiserfs: eliminate per-super xattr lockJeff Mahoney2009-03-303-29/+5
| * reiserfs: Clean up xattrs when REISERFS_FS_XATTR is unsetJeff Mahoney2009-03-302-24/+7
| * reiserfs: remove IS_PRIVATE helpersJeff Mahoney2009-03-301-8/+0
| * reiserfs: introduce reiserfs_error()Jeff Mahoney2009-03-301-0/+4
| * reiserfs: rearrange journal abortJeff Mahoney2009-03-301-1/+1
| * reiserfs: rework reiserfs_panicJeff Mahoney2009-03-301-6/+22
| * reiserfs: eliminate reiserfs_warning from uniqueness functionsJeff Mahoney2009-03-301-5/+2
| * reiserfs: rework reiserfs_warningJeff Mahoney2009-03-301-3/+6
| * reiserfs: use buffer_info for leaf_paste_entriesJeff Mahoney2009-03-301-1/+1
| * reiserfs: audit transaction ids to always be unsigned intsJeff Mahoney2009-03-303-6/+6
| * reiserfs: add support for mount count incrementingJeff Mahoney2009-03-302-1/+8
* | Merge branch 'x86-stage-3-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2009-03-303-13/+47
|\ \
| * \ Merge branch 'linus' into x86/coreIngo Molnar2009-03-28314-4058/+7975
| |\ \
| * \ \ Merge branches 'x86/apic', 'x86/cleanups', 'x86/mm', 'x86/pat', 'x86/setup' a...Ingo Molnar2009-03-242-1/+22
| |\ \ \ | | | |/ | | |/|
| | | |
| | \ \
| *-. \ \ Merge branches 'x86/cleanups', 'x86/mm', 'x86/setup' and 'linus' into x86/coreIngo Molnar2009-03-201-2/+4
| |\ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| | \ \ \ \
| *-----------. \ \ \ \ Merge branches 'x86/cleanups', 'x86/cpu', 'x86/debug', 'x86/mce2', 'x86/mm', ...Ingo Molnar2009-03-1831-158/+329
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | | | | | | * | | | | x86, x2apic: cleanup ifdef CONFIG_INTR_REMAP in io_apic codeSuresh Siddha2009-03-171-7/+38
| | | | | | | * | | | | x86, dmar: start with sane state while enabling dma and interrupt-remappingSuresh Siddha2009-03-171-0/+2
| | | | | | | * | | | | x86, dmar: routines for disabling queued invalidation and intr remappingSuresh Siddha2009-03-171-0/+1
| | | | | | | * | | | | x86, x2apic: enable fault handling for intr-remappingSuresh Siddha2009-03-172-5/+4
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | | | | | | | | | |
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \
| | *---------. \ \ \ \ \ \ \ \ Merge branches 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/debug', 'x86/kconf...Ingo Molnar2009-03-143-1/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | / / / / / / / / | | | | | |_|_|/ / / / / / / / | | | | |/| | | / / / / / / / | | | | | | | |/ / / / / / / | | | | | | |/| / / / / / / | | | |_|_|_|_|/ / / / / / | | |/| | | | | / / / / / | | | | | | | |/ / / / /
| | | | | | | * | | | | VM, x86, PAT: add a new vm flag to track full pfnmap at mmapPallipadi, Venkatesh2009-03-141-13/+3
| | | | | | | * | | | | VM, x86, PAT: Change is_linear_pfn_mapping to not use vm_pgoffPallipadi, Venkatesh2009-03-131-2/+13
| | | | | * | | | | | | Merge branch 'x86/core' into x86/kconfigIngo Molnar2009-03-1334-156/+644
| | | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | * | | | | | | | | | Merge branch 'core/percpu' into x86/coreIngo Molnar2009-03-141-1/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/...Ingo Molnar2009-03-111-1/+5
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'linus' into core/percpuIngo Molnar2009-03-1114-21/+62
| | | |\ \ \ \ \ \ \ \ \ \
| | | | \ \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \ \ \
| | *-. \ \ \ \ \ \ \ \ \ \ \ Merge branches 'x86/asm', 'x86/debug', 'x86/mm', 'x86/setup', 'x86/urgent' an...Ingo Molnar2009-03-121-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | / / / / / | | | | | |_|_|_|_|/ / / / / | | | | |/| | | | | | | | |
| | | | | | | | | | | | | |
| | | \ \ \ \ \ \ \ \ \ \ \
| | *-. \ \ \ \ \ \ \ \ \ \ \ Merge branches 'x86/cleanups', 'x86/kexec', 'x86/mce2' and 'linus' into x86/coreIngo Molnar2009-03-1117-72/+159
| |/|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | / / / / / / / / | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | | | | | | | | | | |
| | | \ \ \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \ \ \
| | | \ \ \ \ \ \ \ \ \ \ \
| | *---. \ \ \ \ \ \ \ \ \ \ \ Merge branches 'x86/apic', 'x86/asm', 'x86/fixmap', 'x86/memtest', 'x86/mm', ...Ingo Molnar2009-03-107-43/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / / | | | | | |/| | | | / / / / / / | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'x86/urgent' into x86/coreIngo Molnar2009-03-055-0/+35
| | |\| | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6Linus Torvalds2009-03-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix a lockdep warning in fasync_helper()Jonathan Corbet2009-03-301-1/+1
* | | | | | | | | | | | | | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2009-03-302-0/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-03-30349-4232/+8775
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-03-2416-76/+145
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge commit 'origin/master' into nextBenjamin Herrenschmidt2009-03-1146-77/+197
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge commit 'ftrace/function-graph' into nextBenjamin Herrenschmidt2009-02-231-0/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \