summaryrefslogtreecommitdiffstats
path: root/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into for-nextJiri Kosina2010-08-1116-359/+556
|\
| * kernel/timer.c: fix kernel-doc function parameter warningRandy Dunlap2010-08-101-0/+1
| * Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-08-102-18/+64
| |\
| | * block: push BKL into blktrace ioctlsArnd Bergmann2010-08-071-0/+43
| | * block: unify flags for struct bio and struct requestChristoph Hellwig2010-08-072-13/+16
| | * block: remove wrappers for request type/flagsChristoph Hellwig2010-08-071-5/+5
| * | Merge branch 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linuxLinus Torvalds2010-08-103-62/+165
| |\ \
| | * | rlimits: implement prlimit64 syscallJiri Slaby2010-07-161-0/+94
| | * | rlimits: switch more rlimit syscalls to do_prlimitJiri Slaby2010-07-162-23/+11
| | * | rlimits: redo do_setrlimit to more generic do_prlimitJiri Slaby2010-07-161-34/+37
| | * | rlimits: do security check under task_lockJiri Slaby2010-07-161-10/+10
| | * | rlimits: allow setrlimit to non-current tasksJiri Slaby2010-07-161-1/+10
| | * | rlimits: split sys_setrlimitJiri Slaby2010-07-161-16/+24
| | * | rlimits: make sure ->rlim_max never grows in sys_setrlimitOleg Nesterov2010-07-161-7/+8
| | * | rlimits: add task_struct to update_rlimit_cpuJiri Slaby2010-07-162-5/+5
| | * | rlimits: security, add task_struct to setrlimitJiri Slaby2010-07-161-1/+1
| * | | Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notifyLinus Torvalds2010-08-109-278/+325
| |\ \ \
| | * | | fanotify: use both marks when possibleEric Paris2010-07-282-2/+2
| | * | | fsnotify: pass both the vfsmount mark and inode markEric Paris2010-07-282-5/+9
| | * | | fsnotify: remove group->maskEric Paris2010-07-281-8/+0
| | * | | fsnotify: cleanup should_send_eventEric Paris2010-07-282-7/+2
| | * | | audit: use the mark in handler functionsEric Paris2010-07-281-17/+3
| | * | | fsnotify: send fsnotify_mark to groups in event handling functionsEric Paris2010-07-282-6/+10
| | * | | fsnotify: store struct file not struct pathEric Paris2010-07-281-2/+2
| | * | | sysctl extern cleanup: inotifyDave Young2010-07-281-3/+3
| | * | | dnotify: move dir_notify_enable declarationAlexey Dobriyan2010-07-281-0/+1
| | * | | fsnotify: split generic and inode specific mark codeEric Paris2010-07-282-7/+7
| | * | | fanotify: sys_fanotify_mark declartionEric Paris2010-07-281-0/+1
| | * | | fanotify: fanotify_init syscall declarationEric Paris2010-07-281-0/+3
| | * | | fsnotify: take inode->i_lock inside fsnotify_find_mark_entry()Andreas Gruenbacher2010-07-282-7/+0
| | * | | fsnotify: rename fsnotify_find_mark_entry to fsnotify_find_markEric Paris2010-07-282-10/+10
| | * | | fsnotify: rename fsnotify_mark_entry to just fsnotify_markEric Paris2010-07-283-13/+13
| | * | | fsnotify: put inode specific fields in an fsnotify_mark in a unionEric Paris2010-07-281-8/+8
| | * | | fsnotify: include vfsmount in should_send_event when appropriateEric Paris2010-07-282-2/+4
| | * | | fsnotify: drop mask argument from fsnotify_alloc_groupEric Paris2010-07-282-2/+2
| | * | | Audit: only set group mask when something is being watchedEric Paris2010-07-281-2/+9
| | * | | fsnotify: fsnotify_obtain_group should be fsnotify_alloc_groupEric Paris2010-07-282-3/+3
| | * | | fsnotify: remove group_num altogetherEric Paris2010-07-282-3/+2
| | * | | fsnotify: include data in should_send callsEric Paris2010-07-282-2/+2
| | * | | fsnotify: provide the data type to should_send_eventEric Paris2010-07-282-2/+4
| | * | | inotify: remove inotify in kernel interfaceEric Paris2010-07-281-1/+0
| | * | | Audit: audit watch init should not be before fsnotify initEric Paris2010-07-281-1/+1
| | * | | Audit: split audit watch KconfigEric Paris2010-07-282-3/+16
| | * | | audit: reimplement audit_trees using fsnotify rather than inotifyEric Paris2010-07-282-106/+132
| | * | | fsnotify: allow addition of duplicate fsnotify marksEric Paris2010-07-281-1/+1
| | * | | audit: do not get and put just to free a watchEric Paris2010-07-283-31/+5
| | * | | audit: redo audit watch locking and refcnt in light of fsnotifyEric Paris2010-07-281-40/+5
| | * | | audit: convert audit watches to use fsnotify instead of inotifyEric Paris2010-07-281-60/+148
| | * | | Audit: clean up the audit_watch splitEric Paris2010-07-285-67/+60
| * | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2010-08-101-1/+1
| |\ \ \ \
OpenPOWER on IntegriCloud