The House has passed H.R. 1540, the National Defense Authorization Act for Fiscal Year 2012. It now goes to Obama for his signature and he has dropped his veto threat. It passed 283-136 with 15 non-votes. Michele Bachmann and Ron Paul did not vote.
The controversial detainee provisions section 1031 has been moved to section 1021. Read the entire bill text here. Here is the final language from section 1021.
SEC. 1021. Affirmation of authority of the Armed Forces of the United States to detain covered persons pursuant to the Authorization for Use of Military Force.
(a) In general.—Congress affirms that the authority of the President to use all necessary and appropriate force pursuant to the Authorization for Use of Military Force (Public Law 107–40; 50 U.S.C. 1541 note) includes the authority for the Armed Forces of the United States to detain covered persons (as defined in subsection (b)) pending disposition under the law of war.
(b) Covered persons.—A covered person under this section is any person as follows:
(1) A person who planned, authorized, committed, or aided the terrorist attacks that occurred on September 11, 2001, or harbored those responsible for those attacks.
(2) A person who was a part of or substantially supported al-Qaeda, the Taliban, or associated forces that are engaged in hostilities against the United States or its coalition partners, including any person who has committed a belligerent act or has directly supported such hostilities in aid of such enemy forces.
(c) Disposition under law of war.—The disposition of a person under the law of war as described in subsection (a) may include the following:
(1) Detention under the law of war without trial until the end of the hostilities authorized by the Authorization for Use of Military Force.
(2) Trial under chapter 47A of title 10, United States Code (as amended by the Military Commissions Act of 2009 (title XVIII of Public Law 111–84)).
(3) Transfer for trial by an alternative court or competent tribunal having lawful jurisdiction.
(4) Transfer to the custody or control of the person’s country of origin, any other foreign country, or any other foreign entity.
(d) Construction.—Nothing in this section is intended to limit or expand the authority of the President or the scope of the Authorization for Use of Military Force.
(e) Authorities.—Nothing in this section shall be construed to affect existing law or authorities relating to the detention of United States citizens, lawful resident aliens of the United States, or any other persons who are captured or arrested in the United States.
(f) Requirement for briefings of Congress.—The Secretary of Defense shall regularly brief Congress regarding the application of the authority described in this section, including the organizations, entities, and individuals considered to be “covered persons” for purposes of subsection (b)(2).