Update gitignore
Merge remote-tracking branch 'origin/ubuntu-12.04' into ubuntu-13.04
Merge remote-tracking branch 'origin/ubuntu-13.04' into ubuntu-13.10
Merge remote-tracking branch 'origin/ubuntu-13.10' into fedora-20
RTL8188CE/RTL8192CE Set IPS and FWLPS to false by default
RTL8188CE/RTL8192CE Set IPS and FWLPS to false by default
Merge remote-tracking branch 'origin/ubuntu-13.10' into fedora-20
Add kernel 3.13 for fedora 20 branch
Merge remote-tracking branch 'origin/ubuntu-12.04' into ubuntu-13.04
Merge remote-tracking branch 'origin/ubuntu-13.04' into ubuntu-13.10
Merge remote-tracking branch 'origin/ubuntu-13.10' into fedora-20
Add change_notes file
Merge remote-tracking branch 'origin/ubuntu-13.10' into fedora-20
Add set_modprobe_conf.sh script
Add update_modprobe_conf.sh script
Update Makefile to call update_modprobe_conf.sh after an install
Merge remote-tracking branch 'origin/ubuntu-12.04' into ubuntu-13.04
Merge remote-tracking branch 'origin/ubuntu-13.04' into ubuntu-13.10
Merge remote-tracking branch 'origin/ubuntu-13.10' into fedora-20
Revert "Add set_modprobe_conf.sh script"

This reverts commit ce67eaff8122e3e46e6d320d763627fc09f16284.

Not sure how this got in there...