diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-24 18:31:57 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-24 18:31:57 (GMT) |
commit | b39c8be6d5e38f4478be0c7aaf1d3a160a4dd330 (patch) | |
tree | f53de2f560ca582ad92dc60b826ef693c4c21a13 /net/x25/af_x25.c | |
parent | df37bd156dcb4f5441beaf5bde444adac974e9a0 (diff) | |
parent | c9db3efee16add57ea459a00dfa00610fcbce931 (diff) | |
download | linux-b39c8be6d5e38f4478be0c7aaf1d3a160a4dd330.tar.xz |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86:
eeepc-laptop: add missing sparse_keymap_free
eeepc-wmi: Build fix
asus: don't modify bluetooth/wlan on boot
dell-wmi: Fix memory leak
eeepc-wmi: add backlight support
eeepc-wmi: use a platform device as parent device of all sub-devices
eeepc-wmi: add an eeepc_wmi context structure
Diffstat (limited to 'net/x25/af_x25.c')
0 files changed, 0 insertions, 0 deletions