diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-16 04:34:48 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-16 04:34:48 +0100 |
| commit | 9a3bff236b51583eaac7c2f0bd1db0dcf7b36a5c (patch) | |
| tree | 0b4ad1c00078b335e49b5fcb460d02797c19a1ff /drivers/net/wireless/ath/regd.h | |
| parent | Merge branch 'acpica' into release (diff) | |
| parent | asus-laptop: change light sens default values. (diff) | |
| download | linux-9a3bff236b51583eaac7c2f0bd1db0dcf7b36a5c.tar.xz linux-9a3bff236b51583eaac7c2f0bd1db0dcf7b36a5c.zip | |
Merge branch 'asus' into release
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/platform/x86/eeepc-laptop.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/net/wireless/ath/regd.h')
0 files changed, 0 insertions, 0 deletions