diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 10:10:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 10:10:49 -0700 |
| commit | 31598e8713ef501c8f6aad2e2ec8a9457e8877c1 (patch) | |
| tree | 255d16a18cbfa78d15486eba07e03b222ddb5f77 /security/apparmor/lsm.c | |
| parent | 241eb95600be194f6b59b85c0bf41194694ebdf1 (diff) | |
| parent | 6966727db1389f4926c6fa6e87a600112a5658b9 (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] kexec: Disable ftrace during kexec
[S390] support XZ compressed kernel
[S390] css_bus_type: make it static
[S390] css_driver: remove duplicate members
[S390] css: remove subchannel private
[S390] css: move chsc_private to drv_data
[S390] css: move io_private to drv_data
[S390] cio: move cdev pointer to io_subchannel_private
[S390] cio: move options to io_sch_private
[S390] cio: move asms to generic header
[S390] cio: move orb definitions to separate header
[S390] Write protect module text and RO data
[S390] dasd: get rid of compile warning
[S390] remove superfluous check from do_IRQ
[S390] remove redundant stack check option
Diffstat (limited to 'security/apparmor/lsm.c')
0 files changed, 0 insertions, 0 deletions