diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:18:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:18:00 -0700 |
| commit | 95948c31bec26e631ecf138cb04dcd547519c7af (patch) | |
| tree | 10a56e8c9635131bcbef28721443b63b39642840 /net/batman-adv/main.c | |
| parent | 45acab01ca6389371ec39e16844768a60f5f1380 (diff) | |
| parent | 69dbb2f79a5626741a24770719406a4edb2cb84f (diff) | |
| download | op-kernel-dev-95948c31bec26e631ecf138cb04dcd547519c7af.zip op-kernel-dev-95948c31bec26e631ecf138cb04dcd547519c7af.tar.gz | |
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] mm: add ZONE_DMA to 31-bit config again
[S390] mm: add page fault retry handling
[S390] mm: handle kernel caused page fault oom situations
[S390] delay: implement ndelay
[S390] topology,sched: fix cpu_coregroup_mask/cpu_book_mask definitions
[S390] hwsampler: allow cpu hotplug
[S390] uaccess: turn __access_ok() into a define
[S390] irq: merge irq.c and s390_ext.c
[S390] irq: fix service signal external interrupt handling
[S390] pfault: always enable service signal interrupt
Diffstat (limited to 'net/batman-adv/main.c')
0 files changed, 0 insertions, 0 deletions
