aboutsummaryrefslogtreecommitdiff
path: root/mm/memory.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-04 14:23:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-04 14:23:41 -0700
commit5895198c56d131cc696556a45f7ff0ea99ac297b (patch)
tree26b98358ece87f30b8788603fee48bc9a3a71728 /mm/memory.c
parent0ecb063a2976b62d5eaecbd5a70bb994fe4b5a8a (diff)
parent9005fcd89c24f2a0fa6f87588b9208aae6d4d6cd (diff)
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: staging: Remove a warning for drivers/staging/wlan-ng/cfg80211.c staging: intel_sst: intelmid needs delay.h staging: solo6x10: add select SND_PCM to fix build error staging: usbip: vhci: fix oops on subsequent attach staging: ft1000: Remove unnecessary EXPORT_SYMBOLs staging: rts_pstor: use #ifdef instead of #if staging: rts_pstor: Add <linux/vmalloc.h> staging: gma500: Depend on X86 staging: olpc: Add <linux/delay.h>
Diffstat (limited to 'mm/memory.c')
0 files changed, 0 insertions, 0 deletions