diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-11 12:46:50 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-11 12:46:50 +0400 |
commit | 0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b (patch) | |
tree | 6f82579cae6d6e39fa9f837a3c349ded51e19d14 /drivers/usb/host/ehci-fsl.h | |
parent | 0729fbf3bc70870370b4f43d652f05a468dc68b8 (diff) | |
parent | 70ff05554f91a1edda1f11684da1dbde09e2feea (diff) | |
download | linux-0c81b2a1448bc6a2a9b2d6469fb0669fb4b25e5b.tar.xz |
Merge branch 'linus' into core/rcu
Conflicts:
include/linux/rculist.h
kernel/rcupreempt.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/host/ehci-fsl.h')
0 files changed, 0 insertions, 0 deletions