Merge commit 'origin/master' into next
[linux-2.6] / drivers / net / irda / w83977af.h
2008-09-25  Chris MasonMerge Btrfs into fs/btrfs
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2